feat(auth): support explicit trusted login and expired session recovery
This commit is contained in:
1 parent
e27c023d66
commit
bee03094f3
5 files changed
+85
-12
No files matched your search
@@ -32,7 +32,7 @@ import urllib.parse as url
|
||||
import urllib.request as http
|
||||
import webbrowser
|
||||
|
||||
VERSION = '0.4.2'
|
||||
VERSION = '0.5.0'
|
||||
|
||||
class Failure(Exception):
|
||||
def __init__(self, message, status=0, payload=None):
|
||||
@@ -144,9 +144,11 @@ class Client:
|
||||
except (ValueError, UnicodeError):
|
||||
raise Failure('Invalid JSON response.') from None
|
||||
|
||||
def login(self, username, password, otp=getpass.getpass):
|
||||
def login(self, username, password, otp=getpass.getpass, *, remember=False):
|
||||
form={'username':username,'password':password}
|
||||
if remember:form['remember']='1'
|
||||
try:
|
||||
result = self.json('/_/auth/login', method='POST', form={'username': username, 'password': password})
|
||||
result = self.json('/_/auth/login', method='POST', form=form)
|
||||
except Failure as e:
|
||||
if e.status != 401 or not e.payload.get('mfa_required') or not e.payload.get('challenge_token'):
|
||||
raise
|
||||
@@ -164,12 +166,13 @@ class Client:
|
||||
self.token = token
|
||||
return time.time() + duration
|
||||
|
||||
def login_oidc(self, no_browser=False, expected_username='', *, sleep=time.sleep, clock=time.monotonic):
|
||||
def login_oidc(self, no_browser=False, expected_username='', *, remember=False, sleep=time.sleep, clock=time.monotonic):
|
||||
verifier = secrets.token_urlsafe(32)
|
||||
challenge = base64.urlsafe_b64encode(hashlib.sha256(verifier.encode()).digest()).decode().rstrip('=')
|
||||
try:
|
||||
started = self.json('/_/auth/cli/start', method='POST', form={
|
||||
'code_challenge': challenge, 'code_challenge_method': 'S256'})
|
||||
form={'code_challenge':challenge,'code_challenge_method':'S256'}
|
||||
if remember:form['remember']='1'
|
||||
started = self.json('/_/auth/cli/start', method='POST', form=form)
|
||||
except Failure as e:
|
||||
if e.status in (404, 405, 501):
|
||||
raise Failure('CLI OIDC login is unavailable on this server. Check the configured server URL and deploy a server version supporting /_/auth/cli/start.', e.status) from None
|
||||
@@ -856,6 +859,7 @@ def main(argv=None):
|
||||
login = argparse.ArgumentParser(prog='pages login', description='Log into the configured connection. Password and TOTP are prompted privately.')
|
||||
login.add_argument('--oidc', action='store_true', help='Authenticate and approve in a browser; no local password required')
|
||||
login.add_argument('--no-browser', action='store_true', help='Print the browser login URL without opening it (requires --oidc)')
|
||||
login.add_argument('--remember', action='store_true', help='Keep this trusted device signed in for up to 30 days, subject to server policy')
|
||||
login_args = login.parse_args(args.args)
|
||||
if login_args.no_browser and not login_args.oidc: login.error('--no-browser requires --oidc')
|
||||
elif '--help' in args.args:
|
||||
@@ -874,13 +878,13 @@ def main(argv=None):
|
||||
print('WARNING: --insecure disables TLS certificate and hostname verification for this invocation. Credentials and data can be intercepted; this option is not saved.', file=sys.stderr)
|
||||
if args.command == 'login':
|
||||
if not login_args.oidc and not spec.get('username'): raise Failure('Set your account with pages configure --username NAME, or use pages login --oidc.')
|
||||
if profile.data.get('token'): raise Failure('Log out this profile before replacing its session.')
|
||||
if profile.data.get('token') and profile.data.get('expires',0)>time.time(): raise Failure('Log out this profile before replacing its active session.')
|
||||
client = Client(spec['origin'], lang=lang, insecure=args.insecure)
|
||||
if login_args.oidc:
|
||||
expires, username = client.login_oidc(login_args.no_browser, spec.get('username', ''))
|
||||
expires, username = client.login_oidc(login_args.no_browser, spec.get('username', ''), remember=login_args.remember)
|
||||
else:
|
||||
username = spec['username']
|
||||
expires = client.login(username, getpass.getpass('Password: '))
|
||||
expires = client.login(username, getpass.getpass('Password: '), remember=login_args.remember)
|
||||
same_identity = profile.data.get('origin') == client.base and profile.data.get('username') == username
|
||||
pending = profile.data.get('task_outbox', {})
|
||||
if pending and not same_identity:
|
||||
|
||||
Reference in new issue
Block a user