You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/02/12 13:03:47 UTC
[airavata-custos] branch develop updated: Implement custos jupyterhub authenticator
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new 10c3701 Implement custos jupyterhub authenticator
new 2c035c6 Merge pull request #256 from isururanawaka/develop
10c3701 is described below
commit 10c3701bc3d1cce553ed174dd25cb96e3bba51d6
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Feb 8 13:17:18 2022 -0500
Implement custos jupyterhub authenticator
---
.../custos_jupyterhub_authenticator/.gitignore | 3 +
.../custos_jupyterhub_authenticator/LICENSE | 201 +++++++++++++++++++++
.../custos_jupyterhub_authenticator/README.md | 16 ++
.../custos_jupyterhub_authenticator/__init__.py | 0
.../build/lib/custosauthenticator/__init__.py | 0
.../build/lib/custosauthenticator/custos.py | 124 +++++++++++++
.../PKG-INFO | 10 +
.../SOURCES.txt | 9 +
.../dependency_links.txt | 1 +
.../requires.txt | 1 +
.../top_level.txt | 1 +
.../custosauthenticator/__init__.py | 0
.../custosauthenticator/custos.py | 124 +++++++++++++
.../requirements.txt | 1 +
.../custos_jupyterhub_authenticator/setup.cfg | 0
.../custos_jupyterhub_authenticator/setup.py | 23 +++
.../resources/keycloak-client-truststore.pkcs12 | Bin 1626 -> 1687 bytes
.../resources/keycloak-client-truststore.pkcs12 | Bin 1626 -> 1687 bytes
18 files changed, 514 insertions(+)
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/.gitignore b/custos-client-sdks/custos_jupyterhub_authenticator/.gitignore
new file mode 100644
index 0000000..9d29e4a
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/.gitignore
@@ -0,0 +1,3 @@
+venv
+*.pyc
+.tox
\ No newline at end of file
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/LICENSE b/custos-client-sdks/custos_jupyterhub_authenticator/LICENSE
new file mode 100644
index 0000000..f49a4e1
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/README.md b/custos-client-sdks/custos_jupyterhub_authenticator/README.md
new file mode 100644
index 0000000..044d959
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/README.md
@@ -0,0 +1,16 @@
+# Apache Custos Jupyterhub Authenticator
+The Apache Custos Jupyterhub Authenticator
+
+
+### Folder Structure
+
+ - custosauthenticator
+
+ Includes oidc plugin to connect with custos oauth services
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/__init__.py b/custos-client-sdks/custos_jupyterhub_authenticator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/build/lib/custosauthenticator/__init__.py b/custos-client-sdks/custos_jupyterhub_authenticator/build/lib/custosauthenticator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/build/lib/custosauthenticator/custos.py b/custos-client-sdks/custos_jupyterhub_authenticator/build/lib/custosauthenticator/custos.py
new file mode 100644
index 0000000..6ca4edf
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/build/lib/custosauthenticator/custos.py
@@ -0,0 +1,124 @@
+"""
+Custos Authenticator to use OAuth2 with JupyterHub
+"""
+import base64
+import os
+from urllib.parse import urlencode
+import logging
+
+import os
+from jupyterhub.auth import LocalAuthenticator
+from tornado import web
+from tornado.httpclient import HTTPRequest
+from tornado.httputil import url_concat
+from traitlets import Bool
+from traitlets import default
+from traitlets import List
+from traitlets import Unicode
+from traitlets import validate
+
+from oauthenticator.oauth2 import OAuthenticator
+from oauthenticator.oauth2 import OAuthLoginHandler
+
+
+class CustosLoginHandler(OAuthLoginHandler):
+ """See //https://airavata.apache.org/custos/ for general information."""
+
+ def authorize_redirect(self, *args, **kwargs):
+ """Add idp, skin to redirect params"""
+ extra_params = kwargs.setdefault('extra_params', {})
+ extra_params["kc_idp_hint"] = 'oidc'
+ return super().authorize_redirect(*args, **kwargs)
+
+
+class CustosOAuthenticator(OAuthenticator):
+ custos_host = Unicode(os.environ.get("CUSTOS_HOST") or "custos.scigap.org", config=True)
+
+ def __init__(self, **kwargs):
+ super().__init__(**kwargs)
+ self.login_service = "Custos Login"
+ self.login_handler = CustosLoginHandler
+ iam_host = ''
+ if self.custos_host == 'custos.scigap.org':
+ iam_host = "keycloak.custos.scigap.org:31000"
+ elif self.custos_host == 'services.staging.usecustos.org':
+ iam_host = "keycloak.staging.usecustos.org:30170"
+ elif self.custos_host == 'service.usecustos.org':
+ iam_host = "keycloak.usecustos.org:31161"
+ x = super().client_id.split("-")
+ tenant_id = x[len(x) - 1]
+ self.iam_uri = "https://{}/auth/realms/{}/protocol/openid-connect/".format(iam_host, tenant_id)
+
+ @default("authorize_url")
+ def _authorize_url_default(self):
+ return "{}auth".format(self.iam_uri)
+
+ @default("token_url")
+ def _token_url_default(self):
+ return "https://{}/apiserver/identity-management/v1.0.0/token".format(self.custos_host)
+
+ scope = List(
+ Unicode(),
+ default_value=['openid', 'email', 'org.cilogon.userinfo'],
+ config=True,
+ help="""The OAuth scopes to request.
+ See cilogon_scope.md for details.
+ At least 'openid' is required.
+ """, )
+
+ @validate('scope')
+ def _validate_scope(self, proposal):
+ """ensure openid is requested"""
+
+ if 'openid' not in proposal.value:
+ return ['openid'] + proposal.value
+ return proposal.value
+
+ async def authenticate(self, handler, data=None):
+ """We set up auth_state based on additional Custos info if we
+ receive it.
+ """
+ code = handler.get_argument("code")
+
+ authS = "{}:{}".format(self.client_id, self.client_secret)
+ tokenByte = authS.encode('utf-8')
+ encodedBytes = base64.b64encode(tokenByte)
+ auth_string = encodedBytes.decode('utf-8')
+ headers = {"Accept": "application/json", "User-Agent": "JupyterHub",
+ "Authorization": "Bearer {}".format(auth_string)}
+
+ params = dict(
+ client_id=self.client_id,
+ client_secret=self.client_secret,
+ redirect_uri=self.oauth_callback_url,
+ code=code,
+ grant_type='authorization_code',
+ )
+
+ url = url_concat(self.token_url, params)
+
+ req = HTTPRequest(url, headers=headers, method="POST", body='')
+
+ token_response = await self.fetch(req)
+ access_token = token_response['access_token']
+
+ # Determine who the logged in user is
+ params = dict(access_token=access_token)
+ req = HTTPRequest(
+ url_concat("https://{}/apiserver/identity-management/v1.0.0/user".format(self.custos_host), params),
+ headers=headers,
+ )
+ resp_json = await self.fetch(req)
+
+ userdict = {"name": resp_json['username']}
+ # Now we set up auth_state
+ userdict["auth_state"] = auth_state = {}
+ # Save the token response and full Custos reply in auth state
+ # These can be used for user provisioning
+ # in the Lab/Notebook environment.
+ auth_state['token_response'] = token_response
+ # store the whole user model in auth_state.custos_user
+ # keep access_token as well, in case anyone was relying on it
+ auth_state['access_token'] = access_token
+ auth_state['custos_user'] = resp_json
+ return userdict
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/PKG-INFO b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/PKG-INFO
new file mode 100644
index 0000000..7f6b84a
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: custos-jupyterhub-authenticator
+Version: 1.0.0
+Summary: Apache Custos Juypterhub Authenticator
+Home-page: https://airavata.apache.org/custos/
+Author: Custos Developers
+Author-email: dev@airavata.apache.org
+License: Apache License 2.0
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/SOURCES.txt b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/SOURCES.txt
new file mode 100644
index 0000000..59a4838
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/SOURCES.txt
@@ -0,0 +1,9 @@
+setup.cfg
+setup.py
+custos_jupyterhub_authenticator.egg-info/PKG-INFO
+custos_jupyterhub_authenticator.egg-info/SOURCES.txt
+custos_jupyterhub_authenticator.egg-info/dependency_links.txt
+custos_jupyterhub_authenticator.egg-info/requires.txt
+custos_jupyterhub_authenticator.egg-info/top_level.txt
+custosauthenticator/__init__.py
+custosauthenticator/custos.py
\ No newline at end of file
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/dependency_links.txt b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/requires.txt b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/requires.txt
new file mode 100644
index 0000000..38235ff
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/requires.txt
@@ -0,0 +1 @@
+oauthenticator>=14.2.0
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/top_level.txt b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/top_level.txt
new file mode 100644
index 0000000..2ef5b49
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/custos_jupyterhub_authenticator.egg-info/top_level.txt
@@ -0,0 +1 @@
+custosauthenticator
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custosauthenticator/__init__.py b/custos-client-sdks/custos_jupyterhub_authenticator/custosauthenticator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/custosauthenticator/custos.py b/custos-client-sdks/custos_jupyterhub_authenticator/custosauthenticator/custos.py
new file mode 100644
index 0000000..6ca4edf
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/custosauthenticator/custos.py
@@ -0,0 +1,124 @@
+"""
+Custos Authenticator to use OAuth2 with JupyterHub
+"""
+import base64
+import os
+from urllib.parse import urlencode
+import logging
+
+import os
+from jupyterhub.auth import LocalAuthenticator
+from tornado import web
+from tornado.httpclient import HTTPRequest
+from tornado.httputil import url_concat
+from traitlets import Bool
+from traitlets import default
+from traitlets import List
+from traitlets import Unicode
+from traitlets import validate
+
+from oauthenticator.oauth2 import OAuthenticator
+from oauthenticator.oauth2 import OAuthLoginHandler
+
+
+class CustosLoginHandler(OAuthLoginHandler):
+ """See //https://airavata.apache.org/custos/ for general information."""
+
+ def authorize_redirect(self, *args, **kwargs):
+ """Add idp, skin to redirect params"""
+ extra_params = kwargs.setdefault('extra_params', {})
+ extra_params["kc_idp_hint"] = 'oidc'
+ return super().authorize_redirect(*args, **kwargs)
+
+
+class CustosOAuthenticator(OAuthenticator):
+ custos_host = Unicode(os.environ.get("CUSTOS_HOST") or "custos.scigap.org", config=True)
+
+ def __init__(self, **kwargs):
+ super().__init__(**kwargs)
+ self.login_service = "Custos Login"
+ self.login_handler = CustosLoginHandler
+ iam_host = ''
+ if self.custos_host == 'custos.scigap.org':
+ iam_host = "keycloak.custos.scigap.org:31000"
+ elif self.custos_host == 'services.staging.usecustos.org':
+ iam_host = "keycloak.staging.usecustos.org:30170"
+ elif self.custos_host == 'service.usecustos.org':
+ iam_host = "keycloak.usecustos.org:31161"
+ x = super().client_id.split("-")
+ tenant_id = x[len(x) - 1]
+ self.iam_uri = "https://{}/auth/realms/{}/protocol/openid-connect/".format(iam_host, tenant_id)
+
+ @default("authorize_url")
+ def _authorize_url_default(self):
+ return "{}auth".format(self.iam_uri)
+
+ @default("token_url")
+ def _token_url_default(self):
+ return "https://{}/apiserver/identity-management/v1.0.0/token".format(self.custos_host)
+
+ scope = List(
+ Unicode(),
+ default_value=['openid', 'email', 'org.cilogon.userinfo'],
+ config=True,
+ help="""The OAuth scopes to request.
+ See cilogon_scope.md for details.
+ At least 'openid' is required.
+ """, )
+
+ @validate('scope')
+ def _validate_scope(self, proposal):
+ """ensure openid is requested"""
+
+ if 'openid' not in proposal.value:
+ return ['openid'] + proposal.value
+ return proposal.value
+
+ async def authenticate(self, handler, data=None):
+ """We set up auth_state based on additional Custos info if we
+ receive it.
+ """
+ code = handler.get_argument("code")
+
+ authS = "{}:{}".format(self.client_id, self.client_secret)
+ tokenByte = authS.encode('utf-8')
+ encodedBytes = base64.b64encode(tokenByte)
+ auth_string = encodedBytes.decode('utf-8')
+ headers = {"Accept": "application/json", "User-Agent": "JupyterHub",
+ "Authorization": "Bearer {}".format(auth_string)}
+
+ params = dict(
+ client_id=self.client_id,
+ client_secret=self.client_secret,
+ redirect_uri=self.oauth_callback_url,
+ code=code,
+ grant_type='authorization_code',
+ )
+
+ url = url_concat(self.token_url, params)
+
+ req = HTTPRequest(url, headers=headers, method="POST", body='')
+
+ token_response = await self.fetch(req)
+ access_token = token_response['access_token']
+
+ # Determine who the logged in user is
+ params = dict(access_token=access_token)
+ req = HTTPRequest(
+ url_concat("https://{}/apiserver/identity-management/v1.0.0/user".format(self.custos_host), params),
+ headers=headers,
+ )
+ resp_json = await self.fetch(req)
+
+ userdict = {"name": resp_json['username']}
+ # Now we set up auth_state
+ userdict["auth_state"] = auth_state = {}
+ # Save the token response and full Custos reply in auth state
+ # These can be used for user provisioning
+ # in the Lab/Notebook environment.
+ auth_state['token_response'] = token_response
+ # store the whole user model in auth_state.custos_user
+ # keep access_token as well, in case anyone was relying on it
+ auth_state['access_token'] = access_token
+ auth_state['custos_user'] = resp_json
+ return userdict
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/requirements.txt b/custos-client-sdks/custos_jupyterhub_authenticator/requirements.txt
new file mode 100644
index 0000000..7f32b5e
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/requirements.txt
@@ -0,0 +1 @@
+oauthenticator>=14.2.0
\ No newline at end of file
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/setup.cfg b/custos-client-sdks/custos_jupyterhub_authenticator/setup.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/custos-client-sdks/custos_jupyterhub_authenticator/setup.py b/custos-client-sdks/custos_jupyterhub_authenticator/setup.py
new file mode 100644
index 0000000..f4a85f2
--- /dev/null
+++ b/custos-client-sdks/custos_jupyterhub_authenticator/setup.py
@@ -0,0 +1,23 @@
+import os
+
+from setuptools import setup, find_packages
+
+
+def read(fname):
+ with open(os.path.join(os.path.dirname(__file__), fname)) as f:
+ return f.read()
+
+
+setup(
+ name='custos_jupyterhub_authenticator',
+ version='1.0.0',
+ packages=find_packages(),
+ package_data={'': ['*.pem']},
+ include_package_data=True,
+ url='https://airavata.apache.org/custos/',
+ license='Apache License 2.0',
+ author='Custos Developers',
+ author_email='dev@airavata.apache.org',
+ install_requires=['oauthenticator>=14.2.0'],
+ description='Apache Custos Juypterhub Authenticator'
+)
diff --git a/custos-core-services/iam-admin-core-service/src/main/resources/keycloak-client-truststore.pkcs12 b/custos-core-services/iam-admin-core-service/src/main/resources/keycloak-client-truststore.pkcs12
index 3fceb37..a82d137 100644
Binary files a/custos-core-services/iam-admin-core-service/src/main/resources/keycloak-client-truststore.pkcs12 and b/custos-core-services/iam-admin-core-service/src/main/resources/keycloak-client-truststore.pkcs12 differ
diff --git a/custos-core-services/identity-core-service/src/main/resources/keycloak-client-truststore.pkcs12 b/custos-core-services/identity-core-service/src/main/resources/keycloak-client-truststore.pkcs12
index 3fceb37..a82d137 100644
Binary files a/custos-core-services/identity-core-service/src/main/resources/keycloak-client-truststore.pkcs12 and b/custos-core-services/identity-core-service/src/main/resources/keycloak-client-truststore.pkcs12 differ