plash-cli 0.2.1__tar.gz → 0.3.0__tar.gz

{plash_cli-0.2.1 → plash_cli-0.3.0}/MANIFEST.in

@@ -3,3 +3,4 @@ include LICENSE
 include CONTRIBUTING.md
 include README.md
 recursive-exclude * __pycache__
+include plash_cli/assets/es256_public_key.pem

{plash_cli-0.2.1/plash_cli.egg-info → plash_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plash_cli
-Version: 0.2.1
+Version: 0.3.0
 Summary: CLI for the Plash hosting service
 Home-page: https://github.com/AnswerDotAI/plash_cli
 Author: Jeremy Howard
@@ -18,6 +18,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: python-dotenv
+Requires-Dist: pyjwt
+Requires-Dist: cryptography
 Provides-Extra: dev
 Requires-Dist: bash_kernel; extra == "dev"
 Requires-Dist: nbdev; extra == "dev"

plash_cli-0.3.0/plash_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.0"

{plash_cli-0.2.1 → plash_cli-0.3.0}/plash_cli/_modidx.py

@@ -5,7 +5,12 @@ d = { 'settings': { 'branch': 'main',
                 'doc_host': 'https://AnswerDotAI.github.io',
                 'git_url': 'https://github.com/AnswerDotAI/plash_cli',
                 'lib_path': 'plash_cli'},
-  'syms': { 'plash_cli.core': { 'plash_cli.core.PlashError': ('core.html#plasherror', 'plash_cli/core.py'),
+  'syms': { 'plash_cli.auth': { 'plash_cli.auth.PlashAuthError': ('auth.html#plashautherror', 'plash_cli/auth.py'),
+                                'plash_cli.auth._parse_jwt': ('auth.html#_parse_jwt', 'plash_cli/auth.py'),
+                                'plash_cli.auth._signin_url': ('auth.html#_signin_url', 'plash_cli/auth.py'),
+                                'plash_cli.auth.goog_id_from_signin_reply': ('auth.html#goog_id_from_signin_reply', 'plash_cli/auth.py'),
+                                'plash_cli.auth.mk_signin_url': ('auth.html#mk_signin_url', 'plash_cli/auth.py')},
+            'plash_cli.core': { 'plash_cli.core.PlashError': ('core.html#plasherror', 'plash_cli/core.py'),
                                 'plash_cli.core._deps': ('core.html#_deps', 'plash_cli/core.py'),
                                 'plash_cli.core._gen_app_name': ('core.html#_gen_app_name', 'plash_cli/core.py'),
                                 'plash_cli.core.apps': ('core.html#apps', 'plash_cli/core.py'),

plash_cli-0.3.0/plash_cli/assets/es256_public_key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEmAlaJd3pPsLNDxMf+gG1e+0DfSnS
+mfrJiP5rgj8GL/xwhALJl9DOrw0gBh1H3Q2/XQvs+Df0rWXJ5bryn2ZPmg==
+-----END PUBLIC KEY-----

plash_cli-0.3.0/plash_cli/auth.py

@@ -0,0 +1,60 @@
+"""Client side logic to add Plash Auth to your app"""
+
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_auth.ipynb.
+
+# %% auto 0
+__all__ = ['signin_completed_rt', 'mk_signin_url', 'PlashAuthError', 'goog_id_from_signin_reply']
+
+# %% ../nbs/01_auth.ipynb 3
+import httpx,os,jwt
+from pathlib import Path
+from warnings import warn
+
+from . import __version__
+
+# %% ../nbs/01_auth.ipynb 5
+signin_completed_rt = "/signin_completed"
+
+# %% ../nbs/01_auth.ipynb 7
+_in_prod = os.getenv('PLASH_PRODUCTION', '') == '1'
+
+# %% ../nbs/01_auth.ipynb 9
+def _signin_url(email_re: str=None, hd_re: str=None):
+    res = httpx.post(os.environ['PLASH_AUTH_URL'], json=dict(email_re=email_re, hd_re=hd_re), 
+                     auth=(os.environ['PLASH_APP_ID'], os.environ['PLASH_APP_SECRET']), 
+                     headers={'X-PLASH-AUTH-VERSION': __version__}).raise_for_status().json()
+    if "warning" in res: warn(res.pop('warning'))
+    return res
+
+# %% ../nbs/01_auth.ipynb 11
+def mk_signin_url(session: dict,       # Session dictionary
+                        email_re: str=None,  # Regex filter for allowed email addresses
+                        hd_re: str=None):    # Regex filter for allowed Google hosted domains
+    "Generate a Google Sign-In URL for Plash authentication."
+    if not _in_prod: return f"{signin_completed_rt}?signin_reply=mock-sign-in-reply"
+    res = _signin_url(email_re, hd_re)
+    session['req_id'] = res['req_id']
+    return res['plash_signin_url']
+
+# %% ../nbs/01_auth.ipynb 13
+def _parse_jwt(reply: str) -> dict:
+    "Parse JWT reply and return decoded claims or error info"
+    try: decoded = jwt.decode(reply, key=open(Path(__file__).parent / "assets" / "es256_public_key.pem","rb").read(), algorithms=["ES256"], 
+                              options=dict(verify_aud=False, verify_iss=False))
+    except Exception as e: return dict(req_id=None, sub=None, err=f'JWT validation failed: {e}')
+    return dict(req_id=decoded.get('req_id'), sub=decoded.get('sub'), err=decoded.get('err'))
+
+# %% ../nbs/01_auth.ipynb 15
+class PlashAuthError(Exception):
+    """Raised when Plash authentication fails"""
+    pass
+
+# %% ../nbs/01_auth.ipynb 17
+def goog_id_from_signin_reply(session: dict, # Session dictionary containing 'req_id'
+                              reply: str):   # The JWT reply string from Plash after Google authentication
+    "Validate Google sign-in reply and returns Google user ID if valid."
+    if not _in_prod: return '424242424242424242424'
+    parsed = _parse_jwt(reply)
+    if session.get('req_id') != parsed['req_id']: raise PlashAuthError("Request originated from a different browser than the one receiving the reply")
+    if parsed['err']: raise PlashAuthError(f"Authentication failed: {parsed['err']}")
+    return parsed['sub']

{plash_cli-0.2.1 → plash_cli-0.3.0}/plash_cli/core.py

@@ -110,7 +110,7 @@ def validate_app(path):
     "Validates directory `path` is a deployable Plash app"
     if not (path / 'main.py').exists():
         raise PlashError('A Plash app requires a main.py file.')
-    deps = _deps((path / 'main.py').read_text())
+    deps = _deps((path / 'main.py').read_text(encoding='utf-8'))
     if  deps and (path/"requirements.txt").exists(): 
         raise PlashError('A Plash app should not contain both a requirements.txt file and inline dependencies (see PEP723).')
 
@@ -137,7 +137,7 @@ def _gen_app_name():
     suffix = ''.join(random.choices(string.ascii_lowercase + string.digits, k=3))
     return f"{random.choice(adjectives)}-{random.choice(nouns)}-{random.choice(verbs)}-{suffix}"
 
-# %% ../nbs/00_core.ipynb 27
+# %% ../nbs/00_core.ipynb 26
 @call_parse
 def deploy(
     path:Path=Path('.'),    # Path to project
@@ -170,7 +170,7 @@ def deploy(
         print(f'It will be live at {name if "." in name else endpoint(sub=name)}')
     else: print(f'Failure: {resp.status_code}\n{resp.text}')
 
-# %% ../nbs/00_core.ipynb 29
+# %% ../nbs/00_core.ipynb 28
 @call_parse
 def view(
     path:Path=Path('.'), # Path to project directory
@@ -182,7 +182,7 @@ def view(
     print(f"Opening browser to view app :\n{url}\n")
     webbrowser.open(url)
 
-# %% ../nbs/00_core.ipynb 31
+# %% ../nbs/00_core.ipynb 30
 @call_parse
 def delete(
     path:Path=Path('.'), # Path to project
@@ -200,7 +200,7 @@ def delete(
     r = mk_auth_req(endpoint(rt=f"/delete?name={name}"), "delete")
     return r.text
 
-# %% ../nbs/00_core.ipynb 33
+# %% ../nbs/00_core.ipynb 32
 def endpoint_func(endpoint_name):
     'Creates a function for a specific API endpoint'
     def func(
@@ -221,10 +221,10 @@ def endpoint_func(endpoint_name):
 stop = endpoint_func('/stop')
 start = endpoint_func('/start')
 
-# %% ../nbs/00_core.ipynb 35
+# %% ../nbs/00_core.ipynb 34
 log_modes = str_enum('log_modes', 'build', 'app')
 
-# %% ../nbs/00_core.ipynb 36
+# %% ../nbs/00_core.ipynb 35
 @call_parse
 def logs(
     path:Path=Path('.'),    # Path to project
@@ -250,7 +250,7 @@ def logs(
     r = mk_auth_req(endpoint(rt=f"/logs?name={name}&mode={mode}"))
     return r.text
 
-# %% ../nbs/00_core.ipynb 38
+# %% ../nbs/00_core.ipynb 37
 @call_parse
 def download(
     path:Path=Path('.'),                 # Path to project
@@ -266,7 +266,7 @@ def download(
         with tarfile.open(fileobj=file_bytes, mode="r:gz") as tar: tar.extractall(path=save_path)
         print(f"Downloaded your app to: {save_path}")
 
-# %% ../nbs/00_core.ipynb 40
+# %% ../nbs/00_core.ipynb 39
 @call_parse
 def apps(verbose:bool=False):
     "List your deployed apps (verbose shows status table: 1=running, 0=stopped)"

{plash_cli-0.2.1 → plash_cli-0.3.0/plash_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plash_cli
-Version: 0.2.1
+Version: 0.3.0
 Summary: CLI for the Plash hosting service
 Home-page: https://github.com/AnswerDotAI/plash_cli
 Author: Jeremy Howard
@@ -18,6 +18,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: python-dotenv
+Requires-Dist: pyjwt
+Requires-Dist: cryptography
 Provides-Extra: dev
 Requires-Dist: bash_kernel; extra == "dev"
 Requires-Dist: nbdev; extra == "dev"

{plash_cli-0.2.1 → plash_cli-0.3.0}/plash_cli.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ setup.py
 plash_cli/__init__.py
 plash_cli/_bash_magic.py
 plash_cli/_modidx.py
+plash_cli/auth.py
 plash_cli/core.py
 plash_cli.egg-info/PKG-INFO
 plash_cli.egg-info/SOURCES.txt
@@ -14,4 +15,5 @@ plash_cli.egg-info/dependency_links.txt
 plash_cli.egg-info/entry_points.txt
 plash_cli.egg-info/not-zip-safe
 plash_cli.egg-info/requires.txt
-plash_cli.egg-info/top_level.txt
+plash_cli.egg-info/top_level.txt
+plash_cli/assets/es256_public_key.pem

{plash_cli-0.2.1 → plash_cli-0.3.0}/plash_cli.egg-info/requires.txt

@@ -1,5 +1,8 @@
 fastcore
 httpx>=0.28.1
+python-dotenv
+pyjwt
+cryptography
 
 [dev]
 bash_kernel

{plash_cli-0.2.1 → plash_cli-0.3.0}/settings.ini

@@ -2,7 +2,7 @@
 jupyter_hooks = False
 repo = plash_cli
 lib_name = plash_cli
-version = 0.2.1
+version = 0.3.0
 min_python = 3.11
 license = apache2
 black_formatting = False
@@ -27,7 +27,7 @@ keywords = nbdev jupyter notebook python
 language = English
 status = 3
 user = AnswerDotAI
-requirements = fastcore httpx>=0.28.1
+requirements = fastcore httpx>=0.28.1 python-dotenv pyjwt cryptography
 dev_requirements = bash_kernel nbdev
 console_scripts = plash_deploy=plash_cli.core:deploy
 	plash_login=plash_cli.core:login

plash_cli-0.2.1/plash_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"