jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed get_host_keys to load_host_keys

pull/12/head
Sheng 2018-04-11 20:19:49 +08:00
parent 6c9af890bc
commit f157be5b6c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
policy.py
View File

@ -4,7 +4,7 @@ import threading
import paramiko import paramiko
def get_host_keys(path): def load_host_keys(path):
if os.path.exists(path) and os.path.isfile(path): if os.path.exists(path) and os.path.isfile(path):
return paramiko.hostkeys.HostKeys(filename=path) return paramiko.hostkeys.HostKeys(filename=path)
return paramiko.hostkeys.HostKeys() return paramiko.hostkeys.HostKeys()

6
settings.py
View File

@ -3,7 +3,7 @@ import os.path
import uuid import uuid
from tornado.options import define from tornado.options import define
from policy import get_host_keys, get_policy_class, check_policy_setting from policy import load_host_keys, get_policy_class, check_policy_setting
define('address', default='127.0.0.1', help='listen address') define('address', default='127.0.0.1', help='listen address')
@ -34,13 +34,13 @@ def get_host_keys_settings(options):
host_keys_filename = os.path.join(base_dir, 'known_hosts') host_keys_filename = os.path.join(base_dir, 'known_hosts')
else: else:
host_keys_filename = options.hostFile host_keys_filename = options.hostFile
host_keys = get_host_keys(host_keys_filename) host_keys = load_host_keys(host_keys_filename)
if not options.sysHostFile: if not options.sysHostFile:
filename = os.path.expanduser('~/.ssh/known_hosts') filename = os.path.expanduser('~/.ssh/known_hosts')
else: else:
filename = options.sysHostFile filename = options.sysHostFile
system_host_keys = get_host_keys(filename) system_host_keys = load_host_keys(filename)
settings = dict( settings = dict(
host_keys=host_keys, host_keys=host_keys,