add statusses of login to statusses.js (4f8be263) · Commits · Zhang Yushan / cve-search

web/index.py

+6 −7

Original line number	Diff line number	Diff line
		@@ -490,10 +490,9 @@ def link(vFeedMap=None,field=None,value=None):
		@app.route('/admin')
		@app.route('/admin/')
		def admin():
		status = "default"
		if Configuration.loginRequired():
		if not current_user.is_authenticated():
		return render_template('login.html', status=status)
		return render_template('login.html')
		else:
		person = User.get("_dummy_")
		login_user(person)
		@@ -503,7 +502,7 @@ def admin():
		separator="==========================\n"
		output=updateFile.read().split(separator)[-2:]
		output=separator+separator.join(output)
		return render_template('admin.html', status=status, stats=adminStats(), updateOutput=filterUpdateField(output))
		return render_template('admin.html', status="default", stats=adminStats(), updateOutput=filterUpdateField(output))


		@app.route('/admin/updatedb')
		@@ -547,7 +546,7 @@ def whitelistDrop():
		@app.route('/admin/whitelist')
		@login_required
		def whitelistView():
		return render_template('list.html', rules=db.getWhitelist(), status=["default", "none"], listType="Whitelist")
		return render_template('list.html', rules=db.getWhitelist(), listType="Whitelist")


		@app.route('/admin/addToList')
		@@ -628,7 +627,7 @@ def blacklistDrop():
		@app.route('/admin/blacklist')
		@login_required
		def blacklistView():
		return render_template('list.html', rules=db.getBlacklist(), status=["default", "none"], listType="Blacklist")
		return render_template('list.html', rules=db.getBlacklist(), listType="Blacklist")


		@app.route('/admin/listmanagement/add')
		@@ -724,9 +723,9 @@ def login_check():
		login_user(person)
		return render_template('admin.html', status="logged_in", stats=adminStats())
		else:
		return render_template('login.html', status=["wrong_combination", "warning"])
		return render_template('login.html', status="wrong_user_pass")
		except:
		return render_template('login.html', status=["outdated_database", "error"])
		return render_template('login.html', status="outdated_database")


		@app.route('/logout')

web/static/js/custom/statusses.js

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@
		}
		_ok=true;break;
		case "logged_in": setStatus("Logged in successfully", "success"); _ok=true;break;
		case "wrong_user_pass": setStatus("Combination user / password is wrong", "danger"); break;
		case "outdated_database": setStatus("The database model is outdated! Please update to the latest database model", "danger"); break;
		case "db_updated": setStatus("Database update finished <div class='well'><pre>"+data['updateOutput']+"</pre></div>", "success"); _ok=true;break;
		case "wl_imported":
		case "bl_imported": setStatus(list+" import finished"); _ok=true;break;

web/templates/login.html

+5 −19

Original line number	Diff line number	Diff line
		{% extends 'layouts/master-page' %}
		{% block title %}Login page{% endblock %}
		{% block head %}
		<script>
		window.onload = function(){ if("{{status}}" != ""){parseStatus({"status": "{{status}}"})} };
		</script>
		{% endblock %}
		{% block content %}
		<!-- Status -->
		<div>
		<!-- type -->
		{% if status[1] == 'error' %}
		<div class="alert alert-danger">
		<span class="glyphicon glyphicon-remove-sign"></span>
		{% elif status[1] == 'warning' %}
		<div class="alert alert-warning">
		<span class="glyphicon glyphicon-warning-sign"></span>
		{% else %}
		<div>
		{% endif %}
		<!-- content -->
		{% if status[0] == "wrong_combination" %}
		Combination user / password is wrong
		{% elif status[0] == "outdated_database" %}
		The database model is outdated! Please update to the latest database model
		{% endif %}
		</div>
		<div class="well well-small">
		<form method="POST" id="login" class="nav form-search" action="/login">
		<strong>Login</strong>

Admin message