Merge pull request #106 from PidgeyL/development (e97b4ba2) · Commits · Zhang Yushan / cve-search

web/index.py

+13 −12

Original line number	Diff line number	Diff line
		@@ -302,7 +302,7 @@ def markCPEs(cve):
		return cve


		def getFilterSettingsFromPost():
		def getFilterSettingsFromPost(r):
		blacklist = request.form.get('blacklistSelect')
		whitelist = request.form.get('whitelistSelect')
		unlisted = request.form.get('unlistedSelect')
		@@ -321,7 +321,7 @@ def getFilterSettingsFromPost():
		'cvss': cvss, 'rejectedSelect': rejectedSelect, "hideSeen": hideSeen}
		# retrieving data
		cve = filter_logic(blacklist, whitelist, unlisted, timeSelect, startDate, endDate,
		timeTypeSelect, cvssSelect, cvss, rejectedSelect, hideSeen, pageLength, 0)
		timeTypeSelect, cvssSelect, cvss, rejectedSelect, hideSeen, pageLength, r)
		return(settings,cve)

		@login_manager.user_loader
		@@ -349,7 +349,7 @@ def index():

		@app.route('/', methods=['POST'])
		def filterPost():
		settings,cve = getFilterSettingsFromPost()
		settings,cve = getFilterSettingsFromPost(0)
		return render_template('index.html', settings=settings, cve=cve, r=0, pageLength=pageLength)


		@@ -357,7 +357,7 @@ def filterPost():
		def filterLast(r):
		if not r:
		r = 0
		settings,cve = getFilterSettingsFromPost()
		settings,cve = getFilterSettingsFromPost(r)
		return render_template('index.html', settings=settings, cve=cve, r=r, pageLength=pageLength)

		@app.route('/r/<int:r>/seen', methods=['POST'])
		@@ -369,7 +369,7 @@ def seen(r):
		if current_user.is_authenticated():
		col = db.mgmt_seen
		col.update({"user":current_user.get_id()},{"$addToSet":{"seen_cves":{"$each":seenlist}}})
		settings,cve = getFilterSettingsFromPost()
		settings,cve = getFilterSettingsFromPost(r)
		return render_template('index.html', settings=settings, cve=cve, r=r, pageLength=pageLength)


		@@ -382,7 +382,7 @@ def unseen(r):
		if current_user.is_authenticated():
		col = db.mgmt_seen
		col.update({"user":current_user.get_id()},{"$pullAll":{"seen_cves":seenlist}})
		settings,cve = getFilterSettingsFromPost()
		settings,cve = getFilterSettingsFromPost(r)
		return render_template('index.html', settings=settings, cve=cve, r=r, pageLength=pageLength)


		@@ -517,7 +517,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)
		@@ -593,10 +593,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", "/")
		@@ -607,8 +607,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'])
		@@ -815,7 +816,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