Several bugfixes (7157ae6d) · Commits · Zhang Yushan / cve-search

lib/Database.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -511,10 +511,10 @@ class Database(metaclass=Singleton):

		# Query data
		def plugin_query(self, plugin, query):
		return sanitize(self.db['plug_%s'%plugin].find(query))
		return self.sanitize(self.db['plug_%s'%plugin].find(query))

		def plugin_query_one(self, plugin, query):
		return sanitize(self.db['plug_%s'%plugin].find_one(query))
		return self.sanitize(self.db['plug_%s'%plugin].find_one(query))

		# Data Manipulation
		def plugin_drop(self, plugin):

lib/DatabaseLayer.py

+12 −11

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ class DatabaseLayer(metaclass=Singleton):
		self.Blacklist = MarkList('blacklist')
		self.Users = Users()
		self.Ranking = Ranking()
		self.Plugins = Plugins()
		self.Redis = Redis()

		def db_info(self, include_admin=False):
		@@ -550,41 +551,41 @@ class Plugins:

		# User settings
		def userSetting_write(self, plugin, user, setting, value):
		plugin_userSetting_write(plugin, user, setting, value)
		self.db.plugin_userSetting_write(plugin, user, setting, value)

		def userSetting_read(self, plugin, user, setting):
		return plugin_userSetting_read(plugin, user, setting)
		return self.db.plugin_userSetting_read(plugin, user, setting)

		def userSettings_delete(self, plugin):
		plugin_userSettings_delete(plugin)
		self.db.plugin_userSettings_delete(plugin)

		# Direct manipulations
		def query(self, plugin, query):
		return plugin_query(plugin, query)
		return self.db.plugin_query(plugin, query)

		def query_one(self, plugin, query):
		return plugin_query_one(plugin, query)
		return self.db.plugin_query_one(plugin, query)

		# Data Manipulation
		def drop(self, plugin):
		plugin_drop(plugin)
		self.db.plugin_drop(plugin)

		def insert(self, plugin, data):
		plugin_insert(plugin, data)
		self.db.plugin_insert(plugin, data)

		def remove(self, plugin, query):
		plugin_remove(plugin, query)
		self.db.plugin_remove(plugin, query)

		def addToList(self, plugin, query, listname, data):
		if type(data) != list: data=[data]
		plugin_addToList(plugin, query, listname, data)
		self.db.plugin_addToList(plugin, query, listname, data)

		def removeFromList(self, plugin, query, listname, data):
		plugin_removeFromList(plugin, query, listname, data)
		self.db.plugin_removeFromList(plugin, query, listname, data)

		def bulkUpdate(self, plugin, keyword, data):
		if type(data) is not list: data = [data]
		plugin_bulkUpdate(plugin, keyword, data)
		self.db.plugin_bulkUpdate(plugin, keyword, data)

		#########
		# Redis #

lib/PluginManager.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -209,10 +209,10 @@ class PluginManager(metaclass=Singleton):
		for plugin in self.getWebPlugins():
		for cve in cves:
		try:
		marks = plugin.mark(cve['id'], **args)
		marks = plugin.mark(cve.id, **args)
		if marks and type(marks) == tuple and len(marks) == 2:
		if marks[0]: cve['icon'] = marks[0]
		if marks[1]: cve['color'] = marks[1]
		if marks[0]: cve.icon = marks[0]
		if marks[1]: cve.color = marks[1]
		except Exception as e:
		print("[!] Plugin %s failed on marking cves!"%plugin.getName())
		print("[!] -> %s"%e)

Admin message