diff --git a/config/hubs/schema.yaml b/config/hubs/schema.yaml index 57ff87ed85..cf8230f64f 100644 --- a/config/hubs/schema.yaml +++ b/config/hubs/schema.yaml @@ -179,6 +179,7 @@ properties: - google-oauth2 - github - password + - CILogon description: | Authentication method users of the hub can use to log in to the hub. We support a subset of the [connectors](https://auth0.com/docs/identityproviders) diff --git a/config/secrets.yaml b/config/secrets.yaml index f705fb6a0f..4caf30b3b9 100644 --- a/config/secrets.yaml +++ b/config/secrets.yaml @@ -3,17 +3,19 @@ auth0: client_id: ENC[AES256_GCM,data:aHw7KJCg4Hn2RiLIiONQXnc48/JFsCCnW0WFVLtCFgM=,iv:FFxe1kNtBh5ljroqCTW3wicQzyDszSCSyYx4Boe2Dns=,tag:a/m2QDTrcKpurKq0IZPjOw==,type:str] client_secret: ENC[AES256_GCM,data:B+fw9jZUc2b0Mb9CD/Pas+aZLPd3Rp1GI6Wrq0wXYcE5HvMEOXhXOqzl9nEKhbR/cVAh5YZt+xlI8G2zOraWbQ==,iv:nDIxzcuQ5Noxp7HyYsL02hBRDLi9An5MN8IEdLnLffA=,tag:T4GgBUkzfSV5UC8RX8yT2g==,type:str] secret_key: ENC[AES256_GCM,data:nmtIokuGQhZJSvwQsqCazzr9RaoUd+vCYo1TXYHei/S6rkYu9e5F/mdQWgJ7EgG9v/OHpekTizthsoTweU472Q==,iv:3THO7BpBvjkOcsUDIEQtC/MnnxYCXjteULmu5h8yEMk=,tag:OOnFcBrEfHmAdViRTuSALQ==,type:str] +cilogon: + client_id: ENC[AES256_GCM,data:YnFfj583dozqhJ9u4Edfycpd5Lm0n+K11garD56DL39M2D7gQck1Gv0cIo+tKevOvWo=,iv:7rwwQyyPawgUm2CMogrydwUFYmc+lr99jjeJN0uP7eY=,tag:ReXGY15QpgUN6/afRYuEMw==,type:str] + client_secret: ENC[AES256_GCM,data:2mKGCCy7s0mMIKaAj41rvkatuqZAAbyJg0yq1O+dfQMvHt5p3Gdba/ClkSg1fjEa6tZr4yUyC8tS7H+y8SMhZBfcC0EnQSxACuspu90yS0e9SXikbkg=,iv:3pDRo39UUlxwKSyDmL5Nylw+ZdOv4OIbvZssZ6YE7bE=,tag:recUQQIsMn5duhqo1Jjqjw==,type:str] sops: kms: [] gcp_kms: - - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2021-04-20T11:50:21Z" - enc: CiQA4OM7eLU3yaaPc6QnzaG3oPhN+OtaG+JCEd57CTIQcOSi+RUSSQBy9hCYh5zsV6u1djsUJPdj+2rwIb3aj0ZWkmZC+XtgXRrGTcI9BuUnnk25yyzi0HWr3CBZxARltajdQHydZCXlY+O28vsySkg= + - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs + created_at: '2021-04-20T11:50:21Z' + enc: CiQA4OM7eLU3yaaPc6QnzaG3oPhN+OtaG+JCEd57CTIQcOSi+RUSSQBy9hCYh5zsV6u1djsUJPdj+2rwIb3aj0ZWkmZC+XtgXRrGTcI9BuUnnk25yyzi0HWr3CBZxARltajdQHydZCXlY+O28vsySkg= azure_kv: [] hc_vault: [] - age: [] - lastmodified: "2021-09-14T15:02:08Z" - mac: ENC[AES256_GCM,data:PUknOH2bQ2iTiBf4m8P4DQYC+GAIFe0wA+9h5xtD7bA54kMIFYcylBjdYE70yKP3hpsE//1aI4qT9bHWRsZ6jTl+p98erqZteafZ2xAlWJjSUBVW5fKXStcf3H/SqIlRNGxy63j1ZgkPiMBlrvwnNEIHqWNlTaJndN5oMGFJTMk=,iv:3Xwy5ECsa7tHjOnVv+F4jtAgaIeK5easVKL6HYUuXVI=,tag:4hqDsUwGS165a0a18Q5E6w==,type:str] + lastmodified: '2021-11-10T14:37:19Z' + mac: ENC[AES256_GCM,data:Kg73SK8Af26cpKWrV8FhSL2ln/KFKPWf2iRjdgKk3mrS9YEJ3dr2FVLlO8QyO9W9A+WjqktnzQ2yhHWU3lec9U/eOwWFr/COEam3qdUSL38DVfMktr5a5LD2/b0B3F6SSfA9jSsOFtka4RHxpoHitsUlp2Ys5B/8x1gbhF/rO6s=,iv:ZDiGjsTIqKGnInU3ssPknpb+HMKs152Fn8ww1pjNWGQ=,tag:0+j2HM1231rV61KwCalHzA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.1 diff --git a/deployer/auth.py b/deployer/auth.py index ba20734cdd..7713305e0a 100644 --- a/deployer/auth.py +++ b/deployer/auth.py @@ -9,7 +9,8 @@ USERNAME_KEYS = { 'github': 'nickname', 'google-oauth2': 'email', - 'password': 'email' + 'password': 'email', + 'CILogon': 'email' }