wip

app/core/auth.py

@@ -1,31 +1,34 @@
 from flask_login import LoginManager, UserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
-from .extensions import db
+from .extensions import db, bcrypt
 from datetime import datetime
 
 login_manager = LoginManager()
 login_manager.login_view = 'auth.login'
 
 class User(UserMixin, db.Model):
+    __tablename__ = 'users'
+    
     id = db.Column(db.Integer, primary_key=True)
-    email = db.Column(db.String(120), unique=True, nullable=False)
-    password_hash = db.Column(db.String(128), nullable=False)
+    username = db.Column(db.String(64), unique=True, index=True)
+    email = db.Column(db.String(120), unique=True, index=True)
+    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)
     
+    def __repr__(self):
+        return f'<User {self.username}>'
+    
     def set_password(self, password):
-        self.password_hash = generate_password_hash(password)
-
+        self.password_hash = bcrypt.generate_password_hash(password).decode('utf-8')
+    
     def check_password(self, password):
-        return check_password_hash(self.password_hash, password)
+        return bcrypt.check_password_hash(self.password_hash, password)
 
     def get_id(self):
         return str(self.id)
 
-    def __repr__(self):
-        return f'<User {self.email}>'
-
 @login_manager.user_loader
 def load_user(user_id):
     return User.query.get(int(user_id))

app/core/extensions.py

@@ -1,28 +1,22 @@
 from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+from flask_login import LoginManager
 from flask_bcrypt import Bcrypt
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
-from flask_login import LoginManager
 from flask_wtf.csrf import CSRFProtect
 
 # Initialize extensions
 db = SQLAlchemy()
-bcrypt = Bcrypt()
+migrate = Migrate()
 login_manager = LoginManager()
 login_manager.login_view = 'auth.login'
-csrf = CSRFProtect()
+login_manager.login_message = 'Please log in to access this page.'
+login_manager.login_message_category = 'info'
 
-# Initialize rate limiter with fallback storage
-try:
-    limiter = Limiter(
-        key_func=get_remote_address,
-        default_limits=["200 per day", "50 per hour"],
-        storage_uri="memory://"  # Use memory storage for development
-    )
-except Exception as e:
-    print(f"Error initializing rate limiter: {e}")
-    # Fallback limiter with very basic functionality
-    limiter = Limiter(
-        key_func=get_remote_address,
-        default_limits=["200 per day", "50 per hour"]
-    )
+bcrypt = Bcrypt()
+csrf = CSRFProtect()
+limiter = Limiter(
+    key_func=get_remote_address,
+    default_limits=["200 per day", "50 per hour"]
+)

app/core/models.py

@@ -1,77 +1,93 @@
-from .extensions import db
+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
 
-class Subnet(db.Model):
+# User model has been moved to app.core.auth
+# Import it from there instead if needed: from app.core.auth import User
+
+class Port(db.Model):
+    __tablename__ = 'ports'
+    
     id = db.Column(db.Integer, primary_key=True)
-    cidr = db.Column(db.String(18), unique=True)  # Format: "192.168.1.0/24"
-    location = db.Column(db.String(80))
-    auto_scan = db.Column(db.Boolean, default=False)
-    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    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))
     
-    @property
-    def network(self):
-        return ipaddress.ip_network(self.cidr)
-    
-    @property
-    def num_addresses(self):
-        return self.network.num_addresses
-    
-    @property
-    def used_ips(self):
-        # Count servers in this subnet
-        return Server.query.filter_by(subnet_id=self.id).count()
+    # Relationship
+    app = db.relationship('App', back_populates='ports')
     
     def __repr__(self):
-        return f'<Subnet {self.cidr}>'
-
+        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(80), unique=True)
-    ip_address = db.Column(db.String(15), unique=True)
-    subnet_id = db.Column(db.Integer, db.ForeignKey('subnet.id'))
-    subnet = db.relationship('Subnet', backref=db.backref('servers', lazy=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)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     
-    # Store ports as JSON in the database
-    _ports = db.Column(db.Text, default='[]')
-    
-    @property
-    def ports(self):
-        return json.loads(self._ports) if self._ports else []
-    
-    @ports.setter
-    def ports(self, value):
-        self._ports = json.dumps(value) if value else '[]'
-    
-    def get_open_ports(self):
-        return self.ports
+    # Relationships
+    subnet = db.relationship('Subnet', back_populates='servers')
+    apps = db.relationship('App', back_populates='server', cascade='all, delete-orphan')
     
     def __repr__(self):
         return f'<Server {self.hostname}>'
 
-
-class App(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(80))
-    server_id = db.Column(db.Integer, db.ForeignKey('server.id'))
-    server = db.relationship('Server', backref=db.backref('apps', lazy=True))
-    documentation = db.Column(db.Text)
-    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+class Subnet(db.Model):
+    __tablename__ = 'subnets'
     
-    # Store ports as JSON in the database
-    _ports = db.Column(db.Text, default='[]')
+    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)
+    auto_scan = db.Column(db.Boolean, default=False)
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+    
+    # Relationships
+    servers = db.relationship('Server', back_populates='subnet')
+    
+    def __repr__(self):
+        return f'<Subnet {self.cidr}>'
     
     @property
-    def ports(self):
-        return json.loads(self._ports) if self._ports else []
+    def used_ips(self):
+        """Number of IPs used in this subnet (servers)"""
+        return len(self.servers)
     
-    @ports.setter
-    def ports(self, value):
-        self._ports = json.dumps(value) if value else '[]'
+    # Getter and setter for active_hosts as JSON
+    @property
+    def active_hosts_list(self):
+        if not self.active_hosts:
+            return []
+        return json.loads(self.active_hosts)
+    
+    @active_hosts_list.setter
+    def active_hosts_list(self, hosts):
+        self.active_hosts = json.dumps(hosts)
+
+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)
+    created_at = db.Column(db.DateTime, default=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')
     
     def __repr__(self):
         return f'<App {self.name}>'

app/core/template_filters.py

@@ -0,0 +1,36 @@
+import ipaddress
+from flask import Blueprint
+
+bp = Blueprint('filters', __name__)
+
+@bp.app_template_filter('ip_network')
+def ip_network_filter(cidr):
+    """Convert a CIDR string to an IP network object"""
+    try:
+        return ipaddress.ip_network(cidr, strict=False)
+    except ValueError:
+        return None
+
+@bp.app_template_filter('ip_address')
+def ip_address_filter(ip):
+    """Convert an IP string to an IP address object"""
+    try:
+        return ipaddress.ip_address(ip)
+    except ValueError:
+        return None
+
+@bp.app_template_filter('markdown')
+def markdown_filter(text):
+    """Convert markdown text to HTML"""
+    import markdown
+    if text:
+        return markdown.markdown(text, extensions=['tables', 'fenced_code'])
+    return ""
+
+@bp.app_template_global('get_ip_network')
+def get_ip_network(cidr):
+    """Global function to get an IP network object from CIDR"""
+    try:
+        return ipaddress.ip_network(cidr, strict=False)
+    except ValueError:
+        return None