vaultfs 1.0.2 → 1.0.4

package/src/auth/AuthManager.java

@@ -1,350 +1,170 @@
 package auth;
 
-
-
-import com.sun.net.httpserver.HttpExchange;
-
-import com.sun.net.httpserver.HttpHandler;
-
-import com.sun.net.httpserver.HttpServer;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.URLDecoder;
-import java.nio.file.Files;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
 import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
 import utils.Colors;
 
-
-
-/** Manages local AuthFS login state, device identity, and account display. */
-
+/** Manages VaultFS login state, device identity, and account display.
+ *  Authentication is delegated to a remote auth server; the CLI polls for results. */
 public class AuthManager {
 
     private static final String TOKEN_DIR = System.getProperty("user.home") + "/.authfs";
-
     private static final String TOKEN_FILE = TOKEN_DIR + "/token";
-
     private static final String EMAIL_FILE = TOKEN_DIR + "/email";
-
     private static final String NAME_FILE = TOKEN_DIR + "/name";
-
     private static final String CONFIG_FILE = TOKEN_DIR + "/config";
 
-
-
     /** Returns whether a non-empty token file exists. */
-
     public static boolean isLoggedIn() {
-
         File token = new File(TOKEN_FILE);
-
         return token.exists() && token.length() > 0;
-
     }
 
-
-
     /** Returns the saved user email or Unknown when not available. */
-
     public static String getUserEmail() {
-
         String email = readFile(EMAIL_FILE);
-
         if (email == null || email.isEmpty()) {
-
             return "Unknown";
-
         }
-
         return email;
-
     }
 
-
-
     /** Returns the saved user name or Unknown when not available. */
-
     public static String getUserName() {
-
         String name = readFile(NAME_FILE);
-
         if (name == null || name.isEmpty()) {
-
             return "Unknown";
-
         }
-
         return name;
-
     }
 
-
-
     /** Returns the device ID from config or generates and persists a new UUID. */
-
     public static String getDeviceId() {
-
         String deviceId = readFile(CONFIG_FILE);
-
         if (deviceId != null && !deviceId.isEmpty()) {
-
             return deviceId;
-
         }
-
-
-
         new File(TOKEN_DIR).mkdirs();
-
         String generated = UUID.randomUUID().toString();
-
         writeFile(CONFIG_FILE, generated);
-
         return generated;
-
     }
 
-
-
-    /** Starts browser-based login, waits for callback, and stores token and email. */
-
+    /** Starts the remote auth-server login flow with browser + polling. */
     public static void startLoginFlow() {
-
         try {
+            // Step 1 — Get a session ID from auth server
+            String sessionId = getNewSession();
+            if (sessionId == null) {
+                System.out.println(Colors.c(Colors.YELLOW, "\u26A0\uFE0F  Auth server unreachable. Continuing as Guest."));
+                persistLogin(UUID.randomUUID().toString(), "guest@vaultfs.local", "Guest");
+                return;
+            }
 
-            final String sessionToken = UUID.randomUUID().toString();
+            // Step 2 — Build login URL
+            String loginUrl = AuthConfig.AUTH_SERVER_URL + "/auth/login?sessionId=" + sessionId;
 
-            String authURL = "http://localhost:9000/login?session=" + sessionToken;
+            // Step 3 — Print login box
+            System.out.println();
+            System.out.println(Colors.c(Colors.CYAN, "  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551              VaultFS \u2014 Login                         \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551                                                      \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551  Opening browser for login...                        \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551                                                      \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551  If browser doesn't open, visit:                     \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551  ") + Colors.c(Colors.GREEN, loginUrl));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551                                                      \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u2551  Press ENTER to skip and continue as Guest           \u2551"));
+            System.out.println(Colors.c(Colors.CYAN, "  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D"));
+            System.out.println();
 
+            // Step 4 — Open browser
+            openBrowser(loginUrl);
 
+            // Step 5 — Poll auth server for result
+            pollForLogin(sessionId);
 
-            final CountDownLatch loginLatch = new CountDownLatch(1);
-            final HttpServer server = HttpServer.create(new InetSocketAddress(9000), 0);
+        } catch (Exception e) {
+            System.out.println(Colors.c(Colors.YELLOW, "\u26A0\uFE0F  Login failed: " + e.getMessage()));
+            persistLogin(UUID.randomUUID().toString(), "guest@vaultfs.local", "Guest");
+        }
+    }
 
-            
+    /** Requests a new auth session from the remote server. */
+    private static String getNewSession() {
+        try {
+            URL url = URI.create(AuthConfig.AUTH_SERVER_URL + "/auth/session/new").toURL();
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setConnectTimeout(5000);
+            conn.setReadTimeout(5000);
+            String response = readStream(conn.getInputStream());
+            return extractJsonValue(response, "sessionId");
+        } catch (Exception e) {
+            return null;
+        }
+    }
 
-            // Serve the React build index.html at /login
-            server.createContext("/login", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    File file = new File(System.getProperty("user.dir") + "/frontend/dist/index.html");
-                    String response = "";
-                    if (file.exists()) {
-                        response = readFile(file.getAbsolutePath());
-                    } else {
-                        response = "<html><body><h1>Error: frontend build not found. Run npm run build in frontend/</h1></body></html>";
-                    }
-                    exchange.getResponseHeaders().set("Content-Type", "text/html; charset=UTF-8");
-                    exchange.sendResponseHeaders(200, response.getBytes("UTF-8").length);
-                    OutputStream os = exchange.getResponseBody();
-                    os.write(response.getBytes("UTF-8"));
-                    os.close();
-                }
-            });
-
-            // Serve static assets (JS, CSS) from frontend/dist/assets/
-            server.createContext("/assets", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    String path = exchange.getRequestURI().getPath();
-                    File file = new File(System.getProperty("user.dir") + "/frontend/dist" + path);
-                    if (file.exists() && file.isFile()) {
-                        String contentType = "application/octet-stream";
-                        if (path.endsWith(".js")) contentType = "application/javascript; charset=UTF-8";
-                        else if (path.endsWith(".css")) contentType = "text/css; charset=UTF-8";
-                        else if (path.endsWith(".svg")) contentType = "image/svg+xml";
-                        byte[] bytes = Files.readAllBytes(file.toPath());
-                        exchange.getResponseHeaders().set("Content-Type", contentType);
-                        exchange.sendResponseHeaders(200, bytes.length);
-                        OutputStream os = exchange.getResponseBody();
-                        os.write(bytes);
-                        os.close();
-                    } else {
-                        String msg = "Not found";
-                        exchange.sendResponseHeaders(404, msg.length());
-                        OutputStream os = exchange.getResponseBody();
-                        os.write(msg.getBytes());
-                        os.close();
-                    }
-                }
-            });
-
-            // Redirect to Google OAuth
-            server.createContext("/auth/google", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    if (!OAuthConfig.isGoogleConfigured()) {
-                        String msg = "<html><body style='font-family:sans-serif;background:#000;color:#fff;display:flex;align-items:center;justify-content:center;height:100vh'><div style='text-align:center'><h2>Google OAuth not configured</h2><p style='color:#86868b;margin-top:12px'>Set GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in .env</p></div></div></body></html>";
-                        exchange.getResponseHeaders().set("Content-Type", "text/html; charset=UTF-8");
-                        exchange.sendResponseHeaders(200, msg.getBytes("UTF-8").length);
-                        OutputStream os = exchange.getResponseBody();
-                        os.write(msg.getBytes("UTF-8"));
-                        os.close();
-                        return;
-                    }
-                    String url = OAuthHandler.getGoogleAuthUrl(sessionToken);
-                    exchange.getResponseHeaders().set("Location", url);
-                    exchange.sendResponseHeaders(302, -1);
-                    exchange.close();
+    /** Polls the auth server for login completion, with ENTER-to-skip support. */
+    private static void pollForLogin(String sessionId) {
+        final boolean[] skipLogin = {false};
+        Thread inputThread = new Thread(() -> {
+            try {
+                System.in.read();
+                skipLogin[0] = true;
+            } catch (Exception ignored) {}
+        });
+        inputThread.setDaemon(true);
+        inputThread.start();
+
+        System.out.println(Colors.c(Colors.GRAY, "\uD83D\uDD10 Waiting for login... (press ENTER to skip)"));
+        System.out.println();
+
+        int waited = 0;
+        while (waited < AuthConfig.LOGIN_TIMEOUT_SECONDS && !skipLogin[0]) {
+            try {
+                Thread.sleep(AuthConfig.POLL_INTERVAL_MS);
+                waited += 2;
+
+                URL url = URI.create(AuthConfig.AUTH_SERVER_URL + "/auth/poll?sessionId=" + sessionId).toURL();
+                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+                conn.setConnectTimeout(5000);
+                conn.setReadTimeout(5000);
+                String response = readStream(conn.getInputStream());
+
+                if (response.contains("\"status\":\"done\"")) {
+                    String name = extractJsonValue(response, "name");
+                    String email = extractJsonValue(response, "email");
+                    String provider = extractJsonValue(response, "provider");
+                    System.out.println(Colors.c(Colors.GREEN, "\u2713") + " Logged in as "
+                        + Colors.c(Colors.YELLOW, name) + " via " + provider);
+                    persistLogin(UUID.randomUUID().toString(), email, name);
+                    return;
                 }
-            });
-
-            // Redirect to GitHub OAuth
-            server.createContext("/auth/github", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    if (!OAuthConfig.isGitHubConfigured()) {
-                        String msg = "<html><body style='font-family:sans-serif;background:#000;color:#fff;display:flex;align-items:center;justify-content:center;height:100vh'><div style='text-align:center'><h2>GitHub OAuth not configured</h2><p style='color:#86868b;margin-top:12px'>Set GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET in .env</p></div></div></body></html>";
-                        exchange.getResponseHeaders().set("Content-Type", "text/html; charset=UTF-8");
-                        exchange.sendResponseHeaders(200, msg.getBytes("UTF-8").length);
-                        OutputStream os = exchange.getResponseBody();
-                        os.write(msg.getBytes("UTF-8"));
-                        os.close();
-                        return;
-                    }
-                    String url = OAuthHandler.getGitHubAuthUrl(sessionToken);
-                    exchange.getResponseHeaders().set("Location", url);
-                    exchange.sendResponseHeaders(302, -1);
-                    exchange.close();
-                }
-            });
-
-            // Google OAuth callback — exchange code for user info
-            server.createContext("/callback/google", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    String state = extractQueryParam(exchange.getRequestURI().getQuery(), "state");
-                    if (state == null || !state.equals(sessionToken)) {
-                        serveError(exchange, "Invalid session. Please restart login.");
-                        exchange.close();
-                        return;
-                    }
-
-                    String code = extractQueryParam(exchange.getRequestURI().getQuery(), "code");
-                    String error = extractQueryParam(exchange.getRequestURI().getQuery(), "error");
-
-                    if (error != null || code == null) {
-                        serveError(exchange, "Google authentication was cancelled or failed.");
-                        return;
-                    }
-
-                    String[] result = OAuthHandler.handleGoogleCallback(code);
-                    if (result == null) {
-                        serveError(exchange, "Failed to verify Google credentials. Please try again.");
-                        return;
-                    }
-
-                    persistLogin(result[2], result[1], result[0]);
-                    serveSuccess(exchange, result[0]);
-                    System.out.println(Colors.c(Colors.GREEN, "✓") + " Logged in via Google as "
-                        + Colors.c(Colors.YELLOW, result[0]) + " (" + result[1] + ")");
-                    loginLatch.countDown();
-                    server.stop(0);
-                }
-            });
-
-            // GitHub OAuth callback — exchange code for user info
-            server.createContext("/callback/github", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    String state = extractQueryParam(exchange.getRequestURI().getQuery(), "state");
-                    if (state == null || !state.equals(sessionToken)) {
-                        serveError(exchange, "Invalid session. Please restart login.");
-                        exchange.close();
-                        return;
-                    }
-
-                    String code = extractQueryParam(exchange.getRequestURI().getQuery(), "code");
-                    String error = extractQueryParam(exchange.getRequestURI().getQuery(), "error");
-
-                    if (error != null || code == null) {
-                        serveError(exchange, "GitHub authentication was cancelled or failed.");
-                        return;
-                    }
-
-                    String[] result = OAuthHandler.handleGitHubCallback(code);
-                    if (result == null) {
-                        serveError(exchange, "Failed to verify GitHub credentials. Please try again.");
-                        return;
-                    }
-
-                    persistLogin(result[2], result[1], result[0]);
-                    serveSuccess(exchange, result[0]);
-                    System.out.println(Colors.c(Colors.GREEN, "✓") + " Logged in via GitHub as "
-                        + Colors.c(Colors.YELLOW, result[0]) + " (" + result[1] + ")");
-                    loginLatch.countDown();
-                    server.stop(0);
-                }
-            });
-
-            // Guest login callback
-            server.createContext("/callback", new HttpHandler() {
-                @Override
-                public void handle(HttpExchange exchange) throws IOException {
-                    persistLogin(UUID.randomUUID().toString(), "guest@local", "Guest");
-                    serveSuccess(exchange, "Guest");
-                    System.out.println(Colors.c(Colors.GREEN, "✓") + " Logged in as " + Colors.c(Colors.YELLOW, "Guest"));
-                    loginLatch.countDown();
-                    server.stop(0);
-                }
-            });
-
-            server.setExecutor(null);
-            server.start();
-
-            // Print styled login URL box
-            System.out.println();
-            System.out.println(Colors.c(Colors.CYAN, "  ╔══════════════════════════════════════════╗"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║       VaultFS — Login Required           ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║                                          ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║  Opening browser at:                     ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║  http://localhost:9000                   ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║                                          ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║  If browser doesn't open, visit the      ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ║  URL above manually.                     ║"));
-            System.out.println(Colors.c(Colors.CYAN, "  ╚══════════════════════════════════════════╝"));
-            System.out.println();
-
-            // Open browser (cross-platform)
-            openBrowser(authURL);
-
-            // Wait up to 120 seconds with periodic progress
-            System.out.println(Colors.c(Colors.GRAY, "\uD83D\uDD10 Waiting for login... (120s timeout)"));
-            System.out.println(Colors.c(Colors.GRAY, "\uD83D\uDC49 If browser didn't open, visit: http://localhost:9000"));
-            System.out.println();
 
-            boolean completed = false;
-            for (int waited = 0; waited < 120; waited++) {
-                if (loginLatch.await(1, TimeUnit.SECONDS)) {
-                    completed = true;
+                if (response.contains("\"status\":\"expired\"")) {
                     break;
                 }
-                if ((waited + 1) % 10 == 0) {
-                    System.out.println(Colors.c(Colors.GRAY, "   Still waiting... (" + (120 - waited - 1) + "s remaining)"));
-                }
-            }
-
-            if (!completed && !isLoggedIn()) {
-                System.out.println(Colors.c(Colors.YELLOW, "\u26A0\uFE0F  Login timed out. Continuing as Guest."));
-                persistLogin(UUID.randomUUID().toString(), "guest@local", "Guest");
-                server.stop(0);
-            }
 
-        } catch (Exception e) {
-
-            System.out.println(Colors.c(Colors.RED, "Login failed: " + e.getMessage()));
+                if (waited % 10 == 0) {
+                    System.out.println(Colors.c(Colors.GRAY, "   Still waiting... ("
+                        + (AuthConfig.LOGIN_TIMEOUT_SECONDS - waited) + "s remaining, press ENTER to skip)"));
+                }
 
+            } catch (Exception ignored) {}
         }
 
+        System.out.println(Colors.c(Colors.YELLOW, "\u26A0\uFE0F  Login skipped. Continuing as Guest."));
+        persistLogin(UUID.randomUUID().toString(), "guest@vaultfs.local", "Guest");
     }
 
     /** Opens a URL in the default browser using platform-specific commands. */
@@ -357,7 +177,6 @@ public class AuthManager {
             } else if (os.contains("mac")) {
                 rt.exec(new String[]{"open", url});
             } else {
-                // Linux/WSL
                 String[] browsers = {"xdg-open", "firefox", "google-chrome", "chromium-browser"};
                 boolean opened = false;
                 for (String browser : browsers) {
@@ -377,24 +196,14 @@ public class AuthManager {
         }
     }
 
-
-
     /** Clears local auth files and logs the user out. */
-
     public static void logout() {
-
         new File(TOKEN_FILE).delete();
-
         new File(EMAIL_FILE).delete();
-
         new File(NAME_FILE).delete();
-
-        System.out.println(Colors.c(Colors.GREEN, "✓") + " Logged out successfully");
-
+        System.out.println(Colors.c(Colors.GREEN, "\u2713") + " Logged out successfully");
     }
 
-
-
     /** Prints formatted account details when logged in. */
     public static void whoami() {
         if (!isLoggedIn()) {
@@ -404,30 +213,19 @@ public class AuthManager {
         System.out.println(Colors.c(Colors.GRAY, "==== Account Details ===="));
         System.out.println("Email    : " + Colors.c(Colors.YELLOW, getUserEmail()));
         System.out.println("Device ID: " + Colors.c(Colors.CYAN, getDeviceId()));
-        System.out.println("Status   : " + Colors.c(Colors.GREEN, "● Online"));
+        System.out.println("Status   : " + Colors.c(Colors.GREEN, "\u25CF Online"));
         System.out.println(Colors.c(Colors.GRAY, "========================="));
     }
 
-
-
     /** Writes file content to the given path and reports failures. */
-
     private static void writeFile(String path, String content) {
-
         try (FileWriter writer = new FileWriter(path)) {
-
             writer.write(content == null ? "" : content);
-
         } catch (IOException e) {
-
             System.out.println(Colors.c(Colors.RED, "Failed to write file: " + path));
-
         }
-
     }
 
-
-
     /** Reads and trims file content or returns null on failure. */
     private static String readFile(String path) {
         try (BufferedReader reader = new BufferedReader(new FileReader(path))) {
@@ -442,20 +240,21 @@ public class AuthManager {
         }
     }
 
-    /** Extracts a query parameter value by key from a URL query string. */
-    private static String extractQueryParam(String query, String key) {
-        if (query == null || query.isEmpty()) return null;
-        for (String part : query.split("&")) {
-            String[] kv = part.split("=", 2);
-            if (kv.length == 2 && key.equals(kv[0])) {
-                try {
-                    return URLDecoder.decode(kv[1], "UTF-8");
-                } catch (Exception e) {
-                    return kv[1];
-                }
-            }
+    /** Reads all bytes from an InputStream and returns as a String. */
+    private static String readStream(InputStream is) throws IOException {
+        return new String(is.readAllBytes());
+    }
+
+    /** Extracts a simple JSON string value by key. */
+    private static String extractJsonValue(String json, String key) {
+        try {
+            String search = "\"" + key + "\":\"";
+            int start = json.indexOf(search) + search.length();
+            int end = json.indexOf("\"", start);
+            return json.substring(start, end);
+        } catch (Exception e) {
+            return "unknown";
         }
-        return null;
     }
 
     /** Persists login credentials to local auth files. */
@@ -465,47 +264,4 @@ public class AuthManager {
         writeFile(EMAIL_FILE, email);
         writeFile(NAME_FILE, name);
     }
-
-    /** Serves the success HTML page after authentication. */
-    private static void serveSuccess(HttpExchange exchange, String name) throws IOException {
-        File successPage = new File(System.getProperty("user.dir") + "/frontend/success.html");
-        String response;
-        if (successPage.exists()) {
-            response = readFile(successPage.getAbsolutePath());
-        } else {
-            response = "<html><head><style>*{margin:0;padding:0;box-sizing:border-box}"
-                + "body{font-family:-apple-system,BlinkMacSystemFont,sans-serif;background:#000;"
-                + "color:#fff;height:100vh;display:flex;align-items:center;justify-content:center;"
-                + "text-align:center}h1{font-size:28px;font-weight:600;margin-bottom:12px}"
-                + "p{color:#86868b;font-size:17px}</style></head><body><div>"
-                + "<h1>You're all set.</h1>"
-                + "<p>Welcome, " + name + ". You can close this tab.</p>"
-                + "</div></body></html>";
-        }
-        exchange.getResponseHeaders().set("Content-Type", "text/html; charset=UTF-8");
-        exchange.sendResponseHeaders(200, response.getBytes("UTF-8").length);
-        OutputStream os = exchange.getResponseBody();
-        os.write(response.getBytes("UTF-8"));
-        os.close();
-    }
-
-    /** Serves a styled error page when authentication fails. */
-    private static void serveError(HttpExchange exchange, String message) throws IOException {
-        String response = "<html><head><style>*{margin:0;padding:0;box-sizing:border-box}"
-            + "body{font-family:-apple-system,BlinkMacSystemFont,sans-serif;background:#000;"
-            + "color:#fff;height:100vh;display:flex;align-items:center;justify-content:center;"
-            + "text-align:center}h1{font-size:24px;font-weight:600;margin-bottom:12px}"
-            + "p{color:#86868b;font-size:17px;max-width:360px}"
-            + "a{color:#fff;margin-top:24px;display:inline-block;font-size:15px}</style></head>"
-            + "<body><div><h1>Authentication Failed</h1>"
-            + "<p>" + message + "</p>"
-            + "<a href='/login'>Try again</a>"
-            + "</div></body></html>";
-        exchange.getResponseHeaders().set("Content-Type", "text/html; charset=UTF-8");
-        exchange.sendResponseHeaders(200, response.getBytes("UTF-8").length);
-        OutputStream os = exchange.getResponseBody();
-        os.write(response.getBytes("UTF-8"));
-        os.close();
-    }
 }
-

package/src/filesystem/DiskService.java

@@ -39,6 +39,9 @@ public class DiskService {
 
         if (existingStartBlockId >= 0) {
             metadata.startBlockId = existingStartBlockId;
+        } else if (existingStartBlockId == -2) {
+            // Already tracked but disk was full — don't retry allocation
+            metadata.startBlockId = -1;
         } else if (metadata.startBlockId == -1) {
             metadata.startBlockId = diskSimulator.allocateFile(metadata.sizeBytes);
         }

package/src/filesystem/FileSystem.java

@@ -762,10 +762,13 @@ public class FileSystem {
             } else if (entry.isFile()) {
                 String filePath = diskService.normalizePath(entry.getAbsolutePath());
                 Integer existingBlockId = fileBlockIndex.get(filePath);
+                // If file is already tracked (even with -1 = disk full), skip re-allocation
+                int blockHint = existingBlockId != null ? existingBlockId : -1;
+                boolean alreadyTracked = fileBlockIndex.containsKey(filePath);
                 models.FileMetadata metadata = diskService.metadataFromDiskFile(
                         entry,
                         diskSimulator,
-                        existingBlockId != null ? existingBlockId : -1
+                        alreadyTracked ? Math.max(blockHint, 0) == blockHint ? blockHint : -2 : -1
                 );
                 diskFiles.add(metadata);
                 diskFilePaths.add(filePath);
@@ -858,7 +861,9 @@ public class FileSystem {
     }
 
     /** Allows plain names only so commands operate within current directory scope.
-     *  Rejects path separators, traversal patterns (..), null bytes, and empty/blank names. */
+     *  Rejects path separators, traversal patterns (..), null bytes, and empty/blank names.
+     *  Note: any name containing ".." is rejected, including "foo..bar", as a
+     *  defense-in-depth measure against path traversal after separator stripping. */
     private boolean isSimpleName(String name) {
         if (name == null || name.trim().isEmpty()) {
             return false;
@@ -869,8 +874,6 @@ public class FileSystem {
         if (".".equals(name) || "..".equals(name)) {
             return false;
         }
-        // Reject names that contain ".." as a substring (e.g. "foo..bar" is fine,
-        // but this catches edge cases with path separators stripped earlier)
         if (name.contains("..")) {
             return false;
         }
@@ -955,7 +958,6 @@ public class FileSystem {
         if (AuthManager.isLoggedIn() && syncPending.compareAndSet(false, true)) {
             syncExecutor.submit(() -> {
                 try {
-                    syncPending.set(false);
                     String stateContent = new String(
                             java.nio.file.Files.readAllBytes(
                                     java.nio.file.Paths.get(
@@ -969,8 +971,9 @@ public class FileSystem {
                             stateContent
                     );
                 } catch (Exception e) {
-                    syncPending.set(false);
                     Logger.warn("[sync] Cloud sync failed: " + e.getClass().getSimpleName());
+                } finally {
+                    syncPending.set(false);
                 }
             });
         }