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.

Sign up for GitHub

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

Jump to bottom

use NB_USER rather than getpass.getuser() #132

Merged
merged 3 commits into from
Jun 16, 2022
Merged

use NB_USER rather than getpass.getuser() #132

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e451d18
use NB_USER rather than getpass.getuser()
vivian-rook Jun 15, 2022
07207f2
try sys user first
vivian-rook Jun 16, 2022
57d89b4
Fallback to getpass.getuser()
yuvipanda Jun 16, 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
14 changes: 11 additions & 3 deletions jupyter_rsession_proxy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import shutil
import subprocess
import tempfile
import pwd
from textwrap import dedent
from urllib.parse import urlparse, urlunparse

Expand Down Expand Up @@ -43,9 +44,16 @@ def rewrite_auth(response, request):
u = urlparse(request.uri)
response.headers[header] = urlunparse(u._replace(path=u.path+v))

def get_system_user():
try:
user = pwd.getpwuid(os.getuid())[0]
except:
user = os.environ.get('NB_USER', getpass.getuser())
return(user)

def setup_rserver():
def _get_env(port):
return dict(USER=getpass.getuser())
return dict(USER=get_system_user())

def db_config(db_dir):
'''
Expand Down Expand Up @@ -85,7 +93,7 @@ def _get_cmd(port):
'--www-port=' + str(port),
'--www-verify-user-agent=0',
'--secure-cookie-key-file=' + ntf.name,
'--server-user=' + getpass.getuser(),
'--server-user=' + get_system_user(),
]
# Support at least v1.2.1335 and up

Expand Down Expand Up @@ -136,7 +144,7 @@ def _get_cmd(port):
'--program-mode=server',
'--log-stderr=1',
'--session-timeout-minutes=0',
'--user-identity=' + getpass.getuser(),
'--user-identity=' + get_system_user(),
'--www-port=' + str(port)
]

Expand Down