Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/support OIDC auth #3452

Merged
merged 37 commits into from
Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
36d2f7e
wip
johnnyaug May 17, 2022
cb7ef87
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 1, 2022
1917428
wip
johnnyaug Jun 1, 2022
2773c98
wip
johnnyaug Jun 2, 2022
bc0e929
remove logout on provider side
johnnyaug Jun 2, 2022
8701140
some docs
johnnyaug Jun 2, 2022
9962f06
some docs
johnnyaug Jun 2, 2022
0eaae0c
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 8, 2022
e85f159
wipˆ
johnnyaug Jun 9, 2022
35e0c42
fix marshalling bug in db service
johnnyaug Jun 9, 2022
4196132
Revert "fix marshalling bug in db service"
johnnyaug Jun 9, 2022
8273b0e
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 9, 2022
b531983
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 9, 2022
8cb2bcd
wip
johnnyaug Jun 9, 2022
2577260
wip
johnnyaug Jun 12, 2022
3cd7c8d
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 12, 2022
4e169b2
docs
johnnyaug Jun 12, 2022
55370e1
fix docs
johnnyaug Jun 12, 2022
e012862
fix tests and linters
johnnyaug Jun 12, 2022
29211b7
cr fixes
johnnyaug Jun 12, 2022
a0153d7
typo
johnnyaug Jun 12, 2022
d402c95
cr fix
johnnyaug Jun 12, 2022
a5e8518
cr fix + more docs
johnnyaug Jun 12, 2022
cb40ff2
cr fixes
johnnyaug Jun 13, 2022
d0c7df8
cr fixes
johnnyaug Jun 16, 2022
d288f0f
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 16, 2022
840fed1
add external id to proto
johnnyaug Jun 16, 2022
253a994
add friendly name in places
johnnyaug Jun 16, 2022
5f4941a
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 19, 2022
26d6753
CR fixes!
johnnyaug Jun 19, 2022
863d356
fix lint
johnnyaug Jun 19, 2022
47c3e08
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 19, 2022
c5190eb
cr fixes
johnnyaug Jun 20, 2022
282a5f2
Merge branch 'master' into feature/support_oidc_auth
johnnyaug Jun 21, 2022
38e43a6
fix lint
johnnyaug Jun 21, 2022
f4a5e57
cr fixes
johnnyaug Jun 21, 2022
d1953d8
rename cookie in swagger
johnnyaug Jun 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/authorization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ components:
encryptedPassword:
type: string
format: byte

external_id:
type: string
UserPassword:
type: object
required:
Expand All @@ -153,6 +154,8 @@ components:
encryptedPassword:
type: string
format: byte
external_id:
type: string
required:
- username

Expand Down
23 changes: 20 additions & 3 deletions api/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ info:
servers:
- url: "/api/v1"
description: lakeFS server endpoint

security:
- jwt_token: []
- basic_auth: []
- cookie_auth: []

- oidc_auth: []
components:
securitySchemes:
basic_auth:
Expand All @@ -27,7 +26,10 @@ components:
type: apiKey
in: cookie
name: access_token

oidc_auth:
type: apiKey
in: cookie
name: auth_session
parameters:
PaginationPrefix:
in: query
Expand Down Expand Up @@ -587,6 +589,8 @@ components:
state:
type: string
enum: [initialized, not_initialized]
oidc_enabled:
type: boolean
AccessKeyCredentials:
type: object
properties:
Expand Down Expand Up @@ -1147,6 +1151,19 @@ paths:
schema:
$ref: "#/components/schemas/CurrentUser"

/oidc/callback:
get:
tags:
- auth
operationId: oauthCallback
security: []
responses:
302:
description: successfully got token
401:
description: failed to exchange authorization code for token
default:
$ref: "#/components/responses/ServerError"
/auth/login:
post:
tags:
Expand Down
13 changes: 13 additions & 0 deletions clients/java/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions clients/java/api/openapi.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 28 additions & 4 deletions clients/java/docs/ActionsApi.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading