diff --git a/src/master/httprest.py b/src/master/httprest.py index 615c021..5c1d3f3 100755 --- a/src/master/httprest.py +++ b/src/master/httprest.py @@ -620,7 +620,7 @@ def user_quotainfo_monitor(user, beans, form, issue): return json.dumps({'success':'true', 'createdvnodes':res}) elif issue == 'net_stats': logger.info("handle request: monitor/user/net_stats/") - res = G_historymgr.get_user_net_stats(user) + res = monitor.Container_Fetcher.get_user_net_stats(user) return json.dumps({'success':'true', 'net_stats':res}) else: return json.dumps({'success':'false', 'message':"Unspported Method!"}) diff --git a/src/master/monitor.py b/src/master/monitor.py index 2aaaa60..219d2d4 100644 --- a/src/master/monitor.py +++ b/src/master/monitor.py @@ -2,6 +2,7 @@ import threading, time, traceback from utils import env from utils.log import logger from httplib2 import Http +from urllib.parse import urlencode # major dict to store the monitoring data # only use on Master @@ -152,6 +153,18 @@ class Container_Fetcher: res = {} return res + # get users' net_stats + @staticmethod + def get_user_net_stats(owner): + global monitor_vnodes + try: + res = monitor_vnodes[owner]['net_stats'] + except Exception as err: + logger.warning(traceback.format_exc()) + logger.warning(err) + res = {} + return res + def get_basic_info(self): global monitor_vnodes try: diff --git a/src/master/userManager.py b/src/master/userManager.py index 6d89835..2622889 100755 --- a/src/master/userManager.py +++ b/src/master/userManager.py @@ -7,7 +7,7 @@ Warning: in some early versions, "token" stand for the instance of class model.U Original author: Liu Peidong ''' -from utils.model import db, User, UserGroup, Notification, UserUsage +from utils.model import db, User, UserGroup, Notification, UserUsage, LoginMsg from functools import wraps import os, subprocess, math import hashlib @@ -144,6 +144,7 @@ class userManager: ''' try: User.query.all() + LoginMsg.query.all() except: db.create_all() if password == None: @@ -254,7 +255,7 @@ class userManager: } return result - def auth_external(self, form): + def auth_external(self, form, userip=""): if (env.getenv('EXTERNAL_LOGIN') != 'True'): failed_result = {'success': 'false', 'reason' : 'external auth disabled'} @@ -267,6 +268,10 @@ class userManager: return failed_result username = result['username'] + logger.info("External login success: username=%s, userip=%s" % (username, userip)) + loginmsg = LoginMsg(username,userip) + db.session.add(loginmsg) + db.session.commit() user = User.query.filter_by(username = username).first() if (user != None and user.auth_method == result['auth_method']): result = { @@ -316,19 +321,28 @@ class userManager: } return result - def auth(self, username, password): + def auth(self, username, password, userip=""): ''' authenticate a user by username & password return a token as well as some user information ''' user = User.query.filter_by(username = username).first() + result = {} if (user == None or user.auth_method =='pam'): - return self.auth_pam(username, password) + result = self.auth_pam(username, password) elif (user.auth_method == 'local'): - return self.auth_local(username, password) + result = self.auth_local(username, password) else: result = {'success':'false', 'reason':'auth_method error'} - return result + + if result['success'] == 'true': + loginmsg = LoginMsg(result['data']['username'],userip) + db.session.add(loginmsg) + db.session.commit() + logger.info("Login success: username=%s, userip=%s" % (result['data']['username'], userip)) + else: + logger.info("Login failed: userip=%s" % (userip)) + return result def auth_token(self, token): ''' diff --git a/src/utils/model.py b/src/utils/model.py index 250ad10..f8e9651 100755 --- a/src/utils/model.py +++ b/src/utils/model.py @@ -43,7 +43,8 @@ app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///'+fsdir+'/global/sys/UserTabl app.config['SQLALCHEMY_BINDS'] = { 'history': 'sqlite:///'+fsdir+'/global/sys/HistoryTable.db', 'beansapplication': 'sqlite:///'+fsdir+'/global/sys/BeansApplication.db', - 'system': 'sqlite:///'+fsdir+'/global/sys/System.db' + 'system': 'sqlite:///'+fsdir+'/global/sys/System.db', + 'login': 'sqlite:///'+fsdir+'/global/sys/Login.db' } app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True try: @@ -97,7 +98,7 @@ class User(db.Model): self.department = department self.truename = truename self.tel = tel - self.beans = 1000 + self.beans = 150 if (date != None): self.register_date = date else: @@ -205,6 +206,21 @@ class UserNotificationPair(db.Model): def __repr__(self): return '' % (self.userName, self.notifyId) +class LoginMsg(db.Model): + __bind_key__ = 'login' + id = db.Column(db.Integer, primary_key=True) + username = db.Column(db.String(10)) + userip = db.Column(db.String(20)) + time = db.Column(db.DateTime) + + def __init__(self, username, userip): + self.username = username + self.userip = userip + self.time = datetime.now() + + def __repr__(self): + return '' % (self.id,self.username,self.userip,self.time.strftime("%Y-%m-%d %H:%M:%S")) + class VNode(db.Model): __bind_key__ = 'history' name = db.Column(db.String(100), primary_key=True) diff --git a/src/worker/monitor.py b/src/worker/monitor.py index de31870..23f2892 100755 --- a/src/worker/monitor.py +++ b/src/worker/monitor.py @@ -668,14 +668,3 @@ class History_Manager: tmp = {"name":vnode.name,"billing":vnode.billing} res.append(tmp) return res - - # get users' net_stats - def get_user_net_stats(self,owner): - global monitor_vnodes - try: - res = monitor_vnodes[owner]['net_stats'] - except Exception as err: - logger.warning(traceback.format_exc()) - logger.warning(err) - res = {} - return res diff --git a/user/user.py b/user/user.py index 38b9de7..9a38c7f 100755 --- a/user/user.py +++ b/user/user.py @@ -87,9 +87,10 @@ def login(): logger.info("handle request : user login") user = request.form.get("user", None) key = request.form.get("key", None) + userip = request.form.get("ip", "") if user == None or key == None: return json.dumps({'success': 'false', 'message':'user or key is null'}) - auth_result = G_usermgr.auth(user,key) + auth_result = G_usermgr.auth(user,key,userip) if auth_result['success'] == 'false': logger.info("%s login failed" % user) return json.dumps({'success':'false', 'message':'auth failed'}) @@ -100,8 +101,9 @@ def login(): def external_login(): global G_usermgr logger.info("handle request : external user login") + userip = request.form.get("ip", "") try: - result = G_usermgr.auth_external(request.form) + result = G_usermgr.auth_external(request.form,userip) return json.dumps(result) except: result = {'success':'false', 'reason':'Something wrong happened when auth an external account'} @@ -517,6 +519,9 @@ def billing_beans(): def beans_apply(cur_user,user,form,issue): global G_applicationmgr if issue == 'apply': + if not cur_user.status == 'normal': + return json.dumps({'success':'false', 'message':'Fail to apply for beans because your account is locked/not activated. Please:'+ + '\n 1. Complete your information and activate your account. \n Or: \n 2.Contact administor for further information'}) number = form.get("number",None) reason = form.get("reason",None) if number is None or reason is None: diff --git a/web/templates/beansapplication.html b/web/templates/beansapplication.html index 80c3010..be018c5 100644 --- a/web/templates/beansapplication.html +++ b/web/templates/beansapplication.html @@ -50,14 +50,14 @@
How many beans do you need? - +
You could only input more characters.
- +
@@ -104,11 +104,15 @@ + {% endblock %} - diff --git a/web/web.py b/web/web.py index 80161a8..63a716a 100755 --- a/web/web.py +++ b/web/web.py @@ -143,7 +143,7 @@ def state_batch_job(): return stateBatchJobView().as_view() @app.route("/workspace/create/", methods=['GET']) -@activated_required +#@activated_required def addCluster(): return addClusterView.as_view() diff --git a/web/webViews/authenticate/login.py b/web/webViews/authenticate/login.py index 91cef45..efc5252 100755 --- a/web/webViews/authenticate/login.py +++ b/web/webViews/authenticate/login.py @@ -52,7 +52,7 @@ class loginView(normalView): @classmethod def post(self): if (request.form['username']): - data = {"user": request.form['username'], "key": request.form['password']} + data = {"user": request.form['username'], "key": request.form['password'], 'ip': request.remote_addr} result = dockletRequest.unauthorizedpost('/login/', data) ok = result and result.get('success', None) if (ok and (ok == "true")):