SecuringSesame: console.diff

core/console/src/main/java/org/openrdf/console/Console.java

@@ -461 +461 @@
 
         private void printHelpConnect() {
                 writeln("Usage:");
-                writeln("connect default           Opens the default repository set for this console");
-                writeln("connect <dataDirectory>   Opens the repository set in the specified data dir");
-                writeln("connect <serverURL>       Connects to a Sesame server");
+                writeln("connect default                         Opens the default repository set for this console");
+                writeln("connect <dataDirectory>                 Opens the repository set in the specified data dir");
+                writeln("connect <serverURL> [user] [password]   Connects to a Sesame server");
         }
 
         private void connect(String[] tokens) {
-                if (tokens.length != 2) {
+                if (tokens.length > 4) {
                         printHelpConnect();
                         return;
                 }
 
                 String target = tokens[1];
+                String username = (tokens.length > 2) ? tokens[2] : null;
+                String password = (tokens.length > 3) ? tokens[3] : null;
 
                 if ("default".equalsIgnoreCase(target)) {
                         connectDefault();
@@ -481 +483 @@
                         try {
                                 new URL(target);
                                 // target is a valid URL
-                                connectRemote(target);
+                                connectRemote(target, username, password);
                         }
                         catch (MalformedURLException e) {
                                 // assume target is a directory path
@@ -505 +507 @@
         }
 
         private boolean connectRemote(String url) {
+                return connectRemote(url, null, null);
+        }
+
+        private boolean connectRemote(String url, String user, String pass) {
                 try {
                         // Ping server
                         HTTPClient httpClient = new HTTPClient();
                         httpClient.setServerURL(url);
+                        
+                        // Check for the password if none is given
+                        if(user != null && pass == null) {
+                                try {
+                                        pass = readPassword("Connection password:");
+                                } catch(IOException e) {
+                                        writeError("Error reading password.");
+                                        logger.warn("Error reading password.", e);
+                                }
+                        }
+                        // Set authentication (null will disable it correctly)
+                        httpClient.setUsernameAndPassword(user, pass);
+                        
+                        // Ping the server
                         httpClient.getServerProtocol();
-
-                        return installNewManager(new RemoteRepositoryManager(url), url);
+                        
+                        RemoteRepositoryManager remoteManager = new RemoteRepositoryManager(url);
+                        if(user != null) {
+                                remoteManager.setUsernameAndPassword(user, pass);
+                        }
+                        
+                        return installNewManager(remoteManager, url);
                 }
                 catch (UnauthorizedException e) {
-                        // FIXME: handle authentication
-                        writeError("Not authorized to access the server");
+                        if(user != null) {
+                                writeError("Not authorized to access the server");
+                                logger.warn("Failed to access the server", e);
+                        } else {
+                                try {
+                                        writeln("Authentication required");
+                                        String username = readln("User name:");
+                                        connectRemote(url, username, null);
+                                } catch(IOException ioe) {
+                                        writeError("Error on getting user name for connection.");
+                                        logger.warn("Could not get user for connection", ioe);
+                                }
+                        }
                 }
                 catch (IOException e) {
                         writeError("Failed to access the server: " + e.getMessage());
@@ -1798 +1834 @@
                 return buf.toString().trim();
         }
 
+        private String readln() throws IOException {
+                return readln(null);
+        }
+
+        private String readln(String message) throws IOException {
+                if(message != null) {
+                        write(message + " ");
+                }
+                return in.readLine();
+        }
+        
+        private String readPassword(String message) throws IOException {
+                // TODO: Proper password reader
+                return readln(message);
+        }
+
         private void write(String s) {
                 out.print(s);
         }