Merge pull request #86 from PidgeyL/master (3e6556c6) · Commits · Zhang Yushan / cve-search

web/index.py

+9 −8

Original line number	Diff line number	Diff line
		@@ -320,9 +320,9 @@ def getFilterSettingsFromPost(r):
		'timeTypeSelect': timeTypeSelect, 'cvssSelect': cvssSelect,
		'cvss': cvss, 'rejectedSelect': rejectedSelect, "hideSeen": hideSeen}
		# retrieving data
		skip = r * 50
		cve = filter_logic(blacklist, whitelist, unlisted, timeSelect, startDate, endDate,
		timeTypeSelect, cvssSelect, cvss, rejectedSelect, hideSeen, pageLength, skip)
		timeTypeSelect, cvssSelect, cvss, rejectedSelect, hideSeen, pageLength, r)

		return(settings,cve)

		@login_manager.user_loader
		@@ -518,7 +518,7 @@ def admin():
		if not current_user.is_authenticated():
		return render_template('login.html', status=status)
		else:
		return render_template('admin.html', status=status)
		return render_template('admin.html', status=status, stats=adminStats())
		else:
		person = User.get("_dummy_")
		login_user(person)
		@@ -594,10 +594,10 @@ def whitelistAdd():
		return render_template('list.html', rules=whitelist, status=status, listType="Whitelist")


		@app.route('/admin/whitelist/remove', methods=['POST'])
		@app.route('/admin/whitelist/remove')
		@login_required
		def whitelistRemove():
		cpe = request.form.get('cpe')
		cpe = request.args.get('cpe', type=str)
		cpe = urllib.parse.quote_plus(cpe).lower()
		cpe = cpe.replace("%3a", ":")
		cpe = cpe.replace("%2f", "/")
		@@ -608,8 +608,9 @@ def whitelistRemove():
		status = ["already_removed", "info"]
		else:
		status = ["invalid_url", "error"]
		whitelist = getWhitelist()
		return render_template('list.html', rules=whitelist, status=status, listType="Whitelist")
		whitelist = list(getWhitelist())
		for x in whitelist:x.pop("_id")
		return jsonify({"status":status, "rules":whitelist, "listType":"Whitelist"})


		@app.route('/admin/whitelist/edit', methods=['POST'])
		@@ -816,7 +817,7 @@ def login_check():
		try:
		if person and pbkdf2_sha256.verify(password, person.password):
		login_user(person)
		return render_template('admin.html', status=["logged_in", "success"])
		return render_template('admin.html', status=["logged_in", "success"], stats=adminStats())
		else:
		return render_template('login.html', status=["wrong_combination", "warning"])
		except:

Admin message