wip

app/routes/api.py

@@ -1,8 +1,10 @@
 from flask import Blueprint, jsonify, request, abort
 from flask_login import login_required
-from app.core.models import Subnet, Server, App
+from app.core.models import Subnet, Server, App, Port
 from app.core.extensions import db
 from app.scripts.ip_scanner import scan
+import random
+import ipaddress
 
 bp = Blueprint('api', __name__, url_prefix='/api')
 
@@ -93,14 +95,24 @@ def get_servers():
 @bp.route('/servers/<int:server_id>', methods=['GET'])
 @login_required
 def get_server(server_id):
-    """Get details for a specific server"""
+    """Get a specific server"""
     server = Server.query.get_or_404(server_id)
     
     apps = []
-    for app in App.query.filter_by(server_id=server_id).all():
+    for app in server.apps:
+        ports = []
+        for port in app.ports:
+            ports.append({
+                'id': port.id,
+                'port_number': port.port_number,
+                'protocol': port.protocol,
+                'description': port.description
+            })
+        
         apps.append({
             'id': app.id,
             'name': app.name,
+            'ports': ports,
             'created_at': app.created_at.strftime('%Y-%m-%d %H:%M:%S')
         })
     
@@ -110,9 +122,8 @@ def get_server(server_id):
         'ip_address': server.ip_address,
         'subnet_id': server.subnet_id,
         'documentation': server.documentation,
-        'created_at': server.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-        'ports': server.ports,
-        'apps': apps
+        'apps': apps,
+        'created_at': server.created_at.strftime('%Y-%m-%d %H:%M:%S')
     }
     
     return jsonify(result)
@@ -196,4 +207,103 @@ def suggest_ports():
     return jsonify([
         {'port': 80, 'type': 'tcp', 'desc': 'HTTP'},
         {'port': 22, 'type': 'tcp', 'desc': 'SSH'}
-    ])
+    ])
+
+@bp.route('/servers/<int:server_id>/suggest_port', methods=['GET'])
+@login_required
+def suggest_port(server_id):
+    """Suggest a random unused port for a server"""
+    server = Server.query.get_or_404(server_id)
+    
+    # Get all used ports for this server
+    used_ports = []
+    for app in server.apps:
+        for port in app.ports:
+            used_ports.append(port.port_number)
+    
+    # Find an unused port in the dynamic/private port range
+    available_port = None
+    attempts = 0
+    
+    while attempts < 50:  # Try 50 times to find a random port
+        # Random port between 10000 and 65535
+        port = random.randint(10000, 65535)
+        
+        if port not in used_ports:
+            available_port = port
+            break
+        
+        attempts += 1
+    
+    if available_port is None:
+        # If no random port found, find first available in sequence
+        for port in range(10000, 65536):
+            if port not in used_ports:
+                available_port = port
+                break
+    
+    return jsonify({'port': available_port})
+
+@bp.route('/apps/<int:app_id>/ports', methods=['GET'])
+@login_required
+def get_app_ports(app_id):
+    """Get all ports for an app"""
+    app = App.query.get_or_404(app_id)
+    
+    ports = []
+    for port in app.ports:
+        ports.append({
+            'id': port.id,
+            'port_number': port.port_number,
+            'protocol': port.protocol,
+            'description': port.description
+        })
+    
+    return jsonify({'ports': ports})
+
+@bp.route('/apps/<int:app_id>/ports', methods=['POST'])
+@login_required
+def add_app_port(app_id):
+    """Add a new port to an app"""
+    app = App.query.get_or_404(app_id)
+    
+    data = request.json
+    if not data or 'port_number' not in data:
+        return jsonify({'error': 'Missing port number'}), 400
+    
+    port_number = data.get('port_number')
+    protocol = data.get('protocol', 'TCP')
+    description = data.get('description', '')
+    
+    # Check if port already exists for this app
+    existing_port = Port.query.filter_by(app_id=app_id, port_number=port_number).first()
+    if existing_port:
+        return jsonify({'error': 'Port already exists for this app'}), 400
+    
+    new_port = Port(
+        app_id=app_id,
+        port_number=port_number,
+        protocol=protocol,
+        description=description
+    )
+    
+    db.session.add(new_port)
+    db.session.commit()
+    
+    return jsonify({
+        'id': new_port.id,
+        'port_number': new_port.port_number,
+        'protocol': new_port.protocol,
+        'description': new_port.description
+    })
+
+@bp.route('/ports/<int:port_id>', methods=['DELETE'])
+@login_required
+def delete_port(port_id):
+    """Delete a port"""
+    port = Port.query.get_or_404(port_id)
+    
+    db.session.delete(port)
+    db.session.commit()
+    
+    return jsonify({'success': True})