wip
This commit is contained in:
pika
parent
2b36992be1
commit
25087d055c
16 changed files with 1394 additions and 816 deletions
|
|
@ -7,16 +7,22 @@ login_manager = LoginManager()
|
|||
login_manager.login_view = "auth.login"
|
||||
|
||||
|
||||
class User(UserMixin, db.Model):
|
||||
class User(db.Model, UserMixin):
|
||||
__tablename__ = "users"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
username = db.Column(db.String(64), unique=True, nullable=True)
|
||||
username = db.Column(db.String(64), unique=True, nullable=False)
|
||||
email = db.Column(db.String(120), unique=True, nullable=False)
|
||||
password_hash = db.Column(db.String(128), nullable=False)
|
||||
password_hash = db.Column(db.String(128))
|
||||
is_admin = db.Column(db.Boolean, default=False)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
last_seen = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
|
||||
# User's assets
|
||||
locations = db.relationship("Location", backref="owner", lazy=True, cascade="all, delete-orphan")
|
||||
subnets = db.relationship("Subnet", backref="owner", lazy=True, cascade="all, delete-orphan")
|
||||
servers = db.relationship("Server", backref="owner", lazy=True, cascade="all, delete-orphan")
|
||||
apps = db.relationship("App", backref="owner", lazy=True, cascade="all, delete-orphan")
|
||||
|
||||
def __repr__(self):
|
||||
return f"<User {self.username}>"
|
||||
|
|
|
|||
|
|
@ -2,68 +2,49 @@ from app.core.extensions import db
|
|||
import json
|
||||
from datetime import datetime
|
||||
import ipaddress
|
||||
from werkzeug.security import generate_password_hash, check_password_hash
|
||||
from flask_login import UserMixin
|
||||
|
||||
# User model has been moved to app.core.auth
|
||||
# Import it from there instead if needed: from app.core.auth import User
|
||||
# Import User from auth instead of defining it here
|
||||
from app.core.auth import User
|
||||
|
||||
|
||||
class Port(db.Model):
|
||||
__tablename__ = "ports"
|
||||
class Location(db.Model):
|
||||
__tablename__ = "locations"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
app_id = db.Column(
|
||||
db.Integer, db.ForeignKey("apps.id", ondelete="CASCADE"), nullable=False
|
||||
)
|
||||
port_number = db.Column(db.Integer, nullable=False)
|
||||
protocol = db.Column(db.String(10), default="TCP") # TCP, UDP, etc.
|
||||
description = db.Column(db.String(200))
|
||||
|
||||
# Relationship
|
||||
app = db.relationship("App", back_populates="ports")
|
||||
|
||||
def __repr__(self):
|
||||
return f"<Port {self.port_number}/{self.protocol}>"
|
||||
|
||||
|
||||
class Server(db.Model):
|
||||
__tablename__ = "servers"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
hostname = db.Column(db.String(64), nullable=False)
|
||||
ip_address = db.Column(db.String(39), nullable=False) # IPv4 or IPv6
|
||||
subnet_id = db.Column(db.Integer, db.ForeignKey("subnets.id"), nullable=False)
|
||||
documentation = db.Column(db.Text)
|
||||
name = db.Column(db.String(255), nullable=False)
|
||||
description = db.Column(db.Text, nullable=True)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(
|
||||
db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow
|
||||
)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
subnet = db.relationship("Subnet", back_populates="servers")
|
||||
apps = db.relationship("App", back_populates="server", cascade="all, delete-orphan")
|
||||
subnets = db.relationship("Subnet", backref="location_ref", lazy=True, cascade="all, delete-orphan")
|
||||
standalone_servers = db.relationship(
|
||||
"Server",
|
||||
primaryjoin="and_(Server.location_id==Location.id, Server.subnet_id==None)",
|
||||
backref="location_ref",
|
||||
lazy=True
|
||||
)
|
||||
|
||||
def __repr__(self):
|
||||
return f"<Server {self.hostname}>"
|
||||
return f"<Location {self.name}>"
|
||||
|
||||
|
||||
class Subnet(db.Model):
|
||||
__tablename__ = "subnets"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
cidr = db.Column(db.String(18), unique=True, nullable=False) # e.g., 192.168.1.0/24
|
||||
location = db.Column(db.String(64))
|
||||
active_hosts = db.Column(db.Text) # Store as JSON string
|
||||
last_scanned = db.Column(db.DateTime)
|
||||
cidr = db.Column(db.String(45), nullable=False)
|
||||
location_id = db.Column(db.Integer, db.ForeignKey("locations.id"), nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
|
||||
auto_scan = db.Column(db.Boolean, default=False)
|
||||
active_hosts = db.Column(db.Text, default='[]')
|
||||
last_scanned = db.Column(db.DateTime, nullable=True)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(
|
||||
db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow
|
||||
)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
servers = db.relationship("Server", back_populates="subnet")
|
||||
servers = db.relationship("Server", backref="subnet", lazy=True)
|
||||
|
||||
def __repr__(self):
|
||||
return f"<Subnet {self.cidr}>"
|
||||
|
|
@ -85,22 +66,63 @@ class Subnet(db.Model):
|
|||
self.active_hosts = json.dumps(hosts)
|
||||
|
||||
|
||||
class Server(db.Model):
|
||||
__tablename__ = "servers"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
hostname = db.Column(db.String(255), nullable=False)
|
||||
ip_address = db.Column(db.String(45), nullable=False)
|
||||
subnet_id = db.Column(db.Integer, db.ForeignKey("subnets.id"), nullable=True)
|
||||
location_id = db.Column(db.Integer, db.ForeignKey("locations.id"), nullable=True)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
|
||||
description = db.Column(db.Text, nullable=True)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
apps = db.relationship("App", back_populates="server", lazy=True, cascade="all, delete-orphan")
|
||||
|
||||
def __repr__(self):
|
||||
return f"<Server {self.hostname}>"
|
||||
|
||||
|
||||
class App(db.Model):
|
||||
__tablename__ = "apps"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
name = db.Column(db.String(64), nullable=False)
|
||||
server_id = db.Column(db.Integer, db.ForeignKey("servers.id"), nullable=False)
|
||||
documentation = db.Column(db.Text)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
|
||||
documentation = db.Column(db.Text, nullable=True)
|
||||
url = db.Column(db.String(255), nullable=True)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(
|
||||
db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow
|
||||
)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
server = db.relationship("Server", back_populates="apps")
|
||||
ports = db.relationship("Port", back_populates="app", cascade="all, delete-orphan")
|
||||
ports = db.relationship("Port", back_populates="app", lazy=True, cascade="all, delete-orphan")
|
||||
|
||||
def __repr__(self):
|
||||
return f"<App {self.name}>"
|
||||
|
||||
|
||||
class Port(db.Model):
|
||||
__tablename__ = "ports"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
app_id = db.Column(db.Integer, db.ForeignKey("apps.id"), nullable=False)
|
||||
port_number = db.Column(db.Integer, nullable=False)
|
||||
protocol = db.Column(db.String(10), nullable=False, default="TCP")
|
||||
description = db.Column(db.String(255), nullable=True)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
app = db.relationship("App", back_populates="ports")
|
||||
|
||||
__table_args__ = (
|
||||
db.UniqueConstraint('app_id', 'port_number', 'protocol', name='unique_port_per_app_protocol'),
|
||||
)
|
||||
|
||||
def __repr__(self):
|
||||
return f"<Port {self.port_number}/{self.protocol}>"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue