Thanks to visit codestin.com
Credit goes to github.com

Skip to content

database class #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 23, 2025
Merged

database class #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d92d076
create database class that all others inherit from
jgor May 23, 2025
ab99419
fix import call
jgor May 23, 2025
3f82570
fix variable
jgor May 23, 2025
c75c574
fix retry_on
jgor May 23, 2025
7803c7d
linting
jgor May 23, 2025
fe39b10
Merge branch 'main' into database-class
jgor May 23, 2025
62267c4
linting
jgor May 23, 2025
84f9eb7
fix merge
jgor May 23, 2025
761113e
clean up
jgor May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions src/dorkbot/blocklist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@
import os
import re
if __package__:
from dorkbot.database import TargetDatabase
from dorkbot.util import get_database_attributes
from dorkbot.database import Database
else:
from database import TargetDatabase
from util import get_database_attributes
from database import Database


class Blocklist:
def __init__(self, address, drop_tables=False, create_tables=False):
for key, value in get_database_attributes(address).items():
setattr(self, key, value)
class Blocklist(Database):
def __init__(self, address, drop_tables=False, create_tables=False, retries=0, retry_on=[]):
Database.__init__(self, address, retries, retry_on)
self.ip_set = set()
self.host_set = set()
self.regex_set = set()
Expand Down Expand Up @@ -50,7 +47,7 @@ def __init__(self, address, drop_tables=False, create_tables=False):

def connect(self):
if self.database:
TargetDatabase.connect(self)
Database.connect(self)
else:
try:
self.blocklist_file = open(self.address, "a")
Expand All @@ -62,11 +59,7 @@ def close(self):
if self.database:
self.db.close()
else:
self.blocklist_file.close()

def execute(self, *sql, fetch=False):
result = TargetDatabase.execute(self, *sql, fetch=fetch)
return result
self.address.close()

def parse_list(self, items):
for item in items:
Expand All @@ -76,6 +69,7 @@ def parse_list(self, items):
ip_net = ipaddress.ip_network(ip)
except ValueError as e:
logging.error(f"Could not parse blocklist item as ip - {str(e)}")
continue
self.ip_set.add(ip_net)
elif item.startswith("host:"):
self.host_set.add(item.split(":")[1])
Expand Down Expand Up @@ -105,7 +99,7 @@ def get_parsed_items(self):
def read_items(self):
if self.database:
rows = self.execute("SELECT item FROM blocklist ORDER BY id ASC", fetch=True)
items = [row[0] for row in rows]
items = [row[0] for row in rows] if rows else []
else:
items = self.blocklist_file.read().splitlines()

Expand Down
Loading