Skip to content

Commit d7e9001

Browse files
committed
Support MLAPI_USER / MLAPI_PASSWORD for creating API user
1 parent d57cd2d commit d7e9001

File tree

1 file changed

+21
-17
lines changed

1 file changed

+21
-17
lines changed

modules/db.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import os
12
from tinydb import TinyDB, Query, where
23
from passlib.hash import bcrypt
34
import modules.common_params as g
@@ -16,24 +17,27 @@ def __init__(self):
1617
self.query = Query()
1718
g.log.debug ('DB engine ready')
1819
if not len(self.users):
19-
g.log.debug ('Initializing default users')
20-
2120
print ('--------------- User Creation ------------')
22-
print ('Please configure atleast one user:')
23-
while True:
24-
name = input ('user name:')
25-
if not name:
26-
print ('Error: username needed')
27-
continue
28-
p1 = getpass.getpass('Please enter password:')
29-
if not p1:
30-
print ('Error: password cannot be empty')
31-
continue
32-
p2 = getpass.getpass('Please re-enter password:')
33-
if p1 != p2:
34-
print ('Passwords do not match, please re-try')
35-
continue
36-
break
21+
if os.getenv('MLAPI_USER') and os.getenv('MLAPI_PASSWORD'):
22+
name = os.getenv('MLAPI_USER')
23+
p1 = os.getenv('MLAPI_PASSWORD')
24+
g.log.debug('Creating user from $MLAPI_USER: {}'.format(name))
25+
else:
26+
print ('Please configure at least one user:')
27+
while True:
28+
name = input ('User name:')
29+
if not name:
30+
print ('Error: username needed')
31+
continue
32+
p1 = getpass.getpass('Please enter password:')
33+
if not p1:
34+
print ('Error: password cannot be empty')
35+
continue
36+
p2 = getpass.getpass('Please re-enter password:')
37+
if p1 != p2:
38+
print ('Passwords do not match, please re-try')
39+
continue
40+
break
3741
self.users.insert({'name':name, 'password':self._get_hash(p1)})
3842
print ('------- User: {} created ----------------'.format(name))
3943

0 commit comments

Comments
 (0)