Merge pull request #2452 from mbtamuli/resolve_duplicate_ssh_key

Solves SSH Key problem when admin user already exists
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2016-11-06 14:48:00 -07:00
commit 39ced08b12
1 file changed
+38 -2
+38 -2
View File
@@ -3,6 +3,7 @@
import cgi import cgi
import json import json
import os import os
import re
import SimpleHTTPServer import SimpleHTTPServer
import SocketServer import SocketServer
import subprocess import subprocess
@@ -100,8 +101,20 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f: with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f:
f.write(params['hostname'].value) f.write(params['hostname'].value)
command = ['sshcommand', 'acl-add', 'dokku', 'admin'] for (index, key) in enumerate(params['keys'].value.splitlines(), 1):
for key in params['keys'].value.split("\n"): user = 'admin'
if self.admin_user_exists() is not None:
user = 'web-admin'
if self.web_admin_user_exists() is not None:
index = int(self.web_admin_user_exists()) + 1
elif self.web_admin_user_exists() is None:
index = 1
elif self.admin_user_exists() is None:
pass
else:
index = int(self.admin_user_exists()) + 1
user = user + str(index)
command = ['sshcommand', 'acl-add', 'dokku', user]
proc = subprocess.Popen(command, stdin=subprocess.PIPE) proc = subprocess.Popen(command, stdin=subprocess.PIPE)
proc.stdin.write(key) proc.stdin.write(key)
proc.stdin.close() proc.stdin.close()
@@ -119,6 +132,29 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
self.end_headers() self.end_headers()
self.wfile.write(json.dumps({'status': 'ok'})) self.wfile.write(json.dumps({'status': 'ok'}))
def web_admin_user_exists(self):
return self.user_exists('web-admin(\d+)')
def admin_user_exists(self):
return self.user_exists('admin(\d+)')
def user_exists(self, name):
command = 'dokku ssh-keys:list'
pattern = re.compile(r'NAME="' + name + '"')
proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
max_num = 0
exists = False
for line in proc.stdout:
m = pattern.search(line)
if m:
# User of the form `user` or `user#` exists
exists = True
max_num = max(max_num, m.group(1))
if exists:
return max_num
else:
return None
def set_debconf_selection(debconf_type, key, value): def set_debconf_selection(debconf_type, key, value):
found = False found = False