Commit Graph

1223 Commits

Author SHA1 Message Date
Konstantin Schaper
616e1efc97 Merge branch 'develop' into bugfix/api-key-to-access-token 2020-11-03 14:48:39 +01:00
Konstantin Schaper
621ed5b827 update unit test name 2020-11-03 14:43:06 +01:00
Konstantin Schaper
5c42c3b49d update unit test 2020-11-03 11:42:44 +01:00
René Pfeuffer
4b15468e67 Merge remote-tracking branch 'origin/develop' into bugfix/rest-download 2020-11-03 10:23:00 +01:00
Sebastian Sdorra
9fe065f796 Merge pull request #1399 from scm-manager/feature/default_branch
Make default branch for git configurable
2020-11-03 08:23:03 +01:00
Konstantin Schaper
578e028d5b Merge branch 'develop' into bugfix/rest-download 2020-11-02 13:28:44 +01:00
Sebastian Sdorra
b6b0736cd9 Make JwtAccessTokenBuilderTest more robust 2020-11-02 10:41:21 +01:00
René Pfeuffer
c2a7ed8869 Validate banch names 2020-10-30 14:24:31 +01:00
Konstantin Schaper
0beb749f23 adjust scm client check and update unit test accordingly 2020-10-30 12:20:45 +01:00
Eduard Heimbuch
23cc02ec99 Merge branch 'develop' into feature/user_converter 2020-10-28 08:42:26 +01:00
René Pfeuffer
1ca18cd44c Do not create web tokens for api keys
This fixes a way for privilege escalation with api keys.
2020-10-26 10:19:59 +01:00
eheimbuch
b8c419792e Merge branch 'develop' into feature/user_converter 2020-10-23 12:08:23 +02:00
Eduard Heimbuch
e8b07aaae1 fix translations 2020-10-23 08:54:56 +02:00
René Pfeuffer
d2d237e0c2 Merge pull request #1385 from scm-manager/bugfix/logging_error_reading_api_token
Reduce logging of ApiTokenRealm
2020-10-23 08:15:22 +02:00
Sebastian Sdorra
1195026fe6 Fix handling of snapshot plugin dependencies 2020-10-22 15:06:39 +02:00
Sebastian Sdorra
7b91cf82bf Reduce logging of ApiTokenRealm 2020-10-22 14:39:09 +02:00
Eduard Heimbuch
f73f60aabc Merge branch 'feature/user_converter' of github.com:scm-manager/scm-manager into feature/user_converter 2020-10-22 13:17:07 +02:00
Eduard Heimbuch
5b10dc57ac create own endpoints for user conversion and apply changed workflow to user form in ui 2020-10-22 13:15:54 +02:00
Konstantin Schaper
f9dab3dc42 Merge branch 'develop' into feature/user_converter 2020-10-21 14:34:57 +02:00
Eduard Heimbuch
69950f63b3 Mind review findings 2020-10-21 12:48:43 +02:00
Eduard Heimbuch
9f29c13ae0 fix unit tests 2020-10-19 17:00:52 +02:00
Eduard Heimbuch
613346fb97 merge with develop 2020-10-19 13:34:54 +02:00
Sebastian Sdorra
553c90ec73 Fix missing default permission for managing public gpg keys 2020-10-16 08:26:20 +02:00
Eduard Heimbuch
258e056646 implement user converter 2020-10-15 16:06:23 +02:00
Sebastian Sdorra
465a9e635b Rename createFallbackMailAddress to more explicit getMailOrFallback 2020-10-15 11:48:17 +02:00
René Pfeuffer
be6bb8bf37 Rename "mail host" to "mail domain name" 2020-10-14 15:46:50 +02:00
René Pfeuffer
7fc7e33c0c Add fallback email to me dto 2020-10-14 15:46:50 +02:00
René Pfeuffer
9c233c1926 Add fallback mail host to global config 2020-10-14 15:46:50 +02:00
Eduard Heimbuch
356ac697cd Merge branch 'develop' into feature/user_converter 2020-10-14 15:45:07 +02:00
René Pfeuffer
ab6e5fd6d6 Fix unit test 2020-10-14 11:43:47 +02:00
René Pfeuffer
07a85ef9c1 Check token content before handling them
This adds plausibility checks before handling tokens as for example jwt
or api keys. Doing so we generate less error logs and therefore we cause
less confusion.
2020-10-14 11:11:23 +02:00
René Pfeuffer
2c640009cc Fix anonymous migration for deleted repositories 2020-10-14 08:36:57 +02:00
Eduard Heimbuch
04a4add8ee add user converter to global configuration 2020-10-13 16:19:00 +02:00
René Pfeuffer
2f5b6d98c6 Merge branch 'support/2.6.x' into develop 2020-10-09 12:16:23 +02:00
Konstantin Schaper
f2a53644b6 introduce api for handling token validation failed exception 2020-10-09 07:20:08 +02:00
René Pfeuffer
d03763671b Mind review remarks 2020-10-06 15:42:26 +02:00
René Pfeuffer
a6814fb938 Delete api keys when user is deleted 2020-10-05 10:53:30 +02:00
René Pfeuffer
20345c895f Add created date to api key 2020-10-05 10:53:30 +02:00
René Pfeuffer
1def884779 Fix rest path 2020-10-05 10:53:30 +02:00
René Pfeuffer
25a87296a7 Add permission check 2020-10-05 10:53:30 +02:00
René Pfeuffer
bd247a4332 Rename role -> permissionRole 2020-10-05 10:53:30 +02:00
René Pfeuffer
4ec75781b7 Add scope from role for api token realm 2020-10-05 10:53:30 +02:00
René Pfeuffer
e3e96f7813 Use data instead of configuration store 2020-10-05 10:53:30 +02:00
René Pfeuffer
12ab218eba Add realm for api key 2020-10-05 10:53:30 +02:00
René Pfeuffer
91471c0ec0 Create rest endpoint to delete api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
0923c2d63e Create rest endpoint to create new api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
0dc96c2403 Use string tokens 2020-10-05 10:53:30 +02:00
René Pfeuffer
2f96ec0d21 Create and read tokens for api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
905fc4158a Add rest resource for api keys 2020-10-05 10:53:30 +02:00
René Pfeuffer
4129f55f27 Implement service for API keys 2020-10-05 10:53:29 +02:00