Changeset 2b76b5f in guacamole

Timestamp:

04/18/12 15:31:20 (13 months ago)

Author:

zhangmaike

Branches:

master, guacamole-debian-parent, rpm, unstable, unstable-websocket

Children:

923a46a

Parents:

42c8e94

git-author:

Michael Jumper <zhangmaike@…> (04/18/12 15:31:20)

git-committer:

Michael Jumper <zhangmaike@…> (04/18/12 15:31:20)

Message:

Code cleanup, add backwards compatibility.

Files:

• doc/example/user-mapping.xml (modified) (1 diff)
• src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java (modified) (6 diffs)

doc/example/user-mapping.xml

@@ -3 +3 @@
     <!-- Per-user authentication and config information -->
     <authorize username="USERNAME" password="PASSWORD">
-
-        <!-- Single authorized connection -->
-                <connection name="localhost">
-            <protocol>vnc</protocol>
-            <param name="hostname">localhost</param>
-            <param name="port">5900</param>
-            <param name="password">VNCPASS</param>
-        </connection>
-
+        <protocol>vnc</protocol>
+        <param name="hostname">localhost</param>
+        <param name="port">5900</param>
+        <param name="password">VNCPASS</param>
     </authorize>
 

src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java

@@ -50 +50 @@
  * This list is stored in an XML file which is reread if modified.
  * 
- * This is modified version of BasicFileAuthenticationProvider written by Michael Jumper.
- * 
- * @author Michal Kotas
+ * @author Michael Jumper, Michal Kotas
  */
 public class BasicFileAuthenticationProvider implements AuthenticationProvider {
@@ -138 +136 @@
         // Validate and return info for given user and pass
         AuthInfo info = mapping.get(credentials.getUsername());
-        if (info != null && info.validate(credentials.getUsername(), credentials.getPassword())) {
-            
-            //Map<String, GuacamoleConfiguration> configs = new HashMap<String, GuacamoleConfiguration>();
-            //configs.put("DEFAULT", info.getConfiguration());
-            //return configs;
-            
-            Map<String, GuacamoleConfiguration> configs = info.getConfigurations();          
-            return configs;
-        }
+        if (info != null && info.validate(credentials.getUsername(), credentials.getPassword()))
+            return info.getConfigurations();
 
         // Unauthorized
@@ -228 +219 @@
 
         public GuacamoleConfiguration getConfiguration(String name) {
-            //return configs;
-            return configs.get(name);
-        }
+
+            // Create new configuration if not already in map
+            GuacamoleConfiguration config = configs.get(name);
+            if (config == null) {
+                config = new GuacamoleConfiguration();
+                configs.put(name, config);
+            }
+
+            return config;
+
+        }
+
         public Map<String, GuacamoleConfiguration> getConfigurations() {
             return configs;
-        }
-        public void addConfiguration(String name) {
-            configs.put(name, new GuacamoleConfiguration());
         }
 
@@ -251 +248 @@
             ROOT,
             USER_MAPPING,
+
+            /* Username/password pair */
+            AUTH_INFO,
+
+            /* Connection configuration information */
             CONNECTION,
-            AUTH_INFO,
             PROTOCOL,
             PARAMETER,
+
+            /* Configuration information associated with default connection */
+            DEFAULT_CONNECTION_PROTOCOL,
+            DEFAULT_CONNECTION_PARAMETER,
+
             END;
         }
@@ -315 +321 @@
                     if (localName.equals("param")) {
                         state = State.CONNECTION;
+                        return;
+                    }
+
+                    break;
+
+                case DEFAULT_CONNECTION_PROTOCOL:
+
+                    if (localName.equals("protocol")) {
+                        state = State.AUTH_INFO;
+                        return;
+                    }
+
+                    break;
+
+                case DEFAULT_CONNECTION_PARAMETER:
+
+                    if (localName.equals("param")) {
+                        state = State.AUTH_INFO;
                         return;
                     }
@@ -378 +402 @@
                             throw new SAXException("Attribute \"name\" required for connection tag.");
                         
-                        current.addConfiguration(currentConnection);
+                        // Next state
+                        state = State.CONNECTION;
+                        return;
+                    }
+
+                    if (localName.equals("protocol")) {
+
+                        // Associate protocol with default connection
+                        currentConnection = "DEFAULT";
                         
                         // Next state
-                        state = State.CONNECTION;
+                        state = State.DEFAULT_CONNECTION_PROTOCOL;
+                        return;
+                    }
+
+                    if (localName.equals("param")) {
+
+                        // Associate parameter with default connection
+                        currentConnection = "DEFAULT";
+                        
+                        currentParameter = attributes.getValue("name");
+                        if (currentParameter == null)
+                            throw new SAXException("Attribute \"name\" required for param tag.");
+
+                        // Next state
+                        state = State.DEFAULT_CONNECTION_PARAMETER;
                         return;
                     }