Commit 0388f4bd authored by Chris Hines's avatar Chris Hines
Browse files

fix bug

parent e06596c6
......@@ -77,7 +77,7 @@ def make_key():
pass
except FileNotFoundError:
pass
subprocess.call(['ssh-keygen', '-t', 'ecdsa', '-N', '', '-f', keypath],
subprocess.call(['ssh-keygen', '-t', 'ed25519', '-N', '', '-f', keypath],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL)
return keypath
......@@ -169,8 +169,9 @@ def main():
if os.path.exists(os.path.expanduser('~/.authservers.json')):
with open(os.path.expanduser('~/.authservers.json'),'r') as f:
config = json.loads(f.read())
with pkg_resources.open_text(config,'authservers.json') as f:
config = json.loads(f.read())
else:
with pkg_resources.open_text(config,'authservers.json') as f:
config = json.loads(f.read())
authservice = config[0]
......
[
{
"authorise": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/",
"authorise": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/oauth2/",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"sign": "https://sshauthz.cloud.cvl.org.au/pysshauthz/sign/monash_hpcid/api/v1/sign_key",
"logout": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/logout",
"sign": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/sign/monash_hpcid/api/v1/sign_key",
"logout": "https://sshauthz-dev.cloud.cvl.org.au/pysshauthz/oauth2/logout",
"name": "CVL",
"icon": null,
"scope": "user:email",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment