Add support for Basic Authentication to XMLA driver (contributed by L…

…uc Boudreau); add Base64 utilities (needed for Basic Authentication); fix MetadataTest for additional functions just added to mondrian.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@65 c6a108a4-781c-0410-a6c6-c2d559e19af0

src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java

@@ -114,6 +114,20 @@ abstract class XmlaOlap4jConnection implements OlapConnection {
                 + XmlaOlap4jDriver.Property.Server.name()
                 + "' must be specified");
         }
+
+        // Basic authentication. Make sure the credentials passed as standard
+        // JDBC parameters override any credentials already included in the URL
+        // as part of the standard URL scheme.
+        if (map.containsKey("user") && map.containsKey("password")) {
+            serverUrl = serverUrl.replaceFirst(
+                ":\\/\\/(.*\\@){0,1}",
+                "://"
+                    .concat(map.get("user"))
+                    .concat(":")
+                    .concat(map.get("password")
+                    .concat("@")));
+        }
+
         try {
             this.serverUrl = new URL(serverUrl);
         } catch (MalformedURLException e) {
@@ -641,7 +655,10 @@ public void handle(Element row, Context context, List<XmlaOlap4jDimension> list)
     }
 
     static class HierarchyHandler extends HandlerImpl<XmlaOlap4jHierarchy> {
-        public void handle(Element row, Context context, List<XmlaOlap4jHierarchy> list) {
+        public void handle(
+            Element row, Context context, List<XmlaOlap4jHierarchy> list)
+            throws OlapException
+        {
             /*
             Example:
 
@@ -687,9 +704,9 @@ public void handle(Element row, Context context, List<XmlaOlap4jHierarchy> list)
                 stringElement(row, "DEFAULT_MEMBER");
             list.add(
                 new XmlaOlap4jHierarchy(
-                    context.getDimension(row), hierarchyUniqueName, hierarchyName,
-                    hierarchyCaption, description, allMember != null,
-                    defaultMemberUniqueName));
+                    context.getDimension(row), hierarchyUniqueName,
+                    hierarchyName, hierarchyCaption, description,
+                    allMember != null, defaultMemberUniqueName));
         }
     }
 

src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java

@@ -8,6 +8,8 @@
 */
 package org.olap4j.driver.xmla;
 
+import org.olap4j.impl.Base64;
+
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
@@ -214,6 +216,14 @@ public byte[] get(URL url, String request) throws IOException {
             urlConnection.setDoOutput(true);
             urlConnection.setRequestProperty("content-type", "text/xml");
 
+            // Encode credentials for basic authentication
+            if (url.getUserInfo() != null) {
+                String encoding =
+                    Base64.encodeBytes(url.getUserInfo().getBytes(), 0);
+                urlConnection.setRequestProperty(
+                    "Authorization", "Basic " + encoding);
+            }
+
             // Send data (i.e. POST). Assume default encoding.
             urlConnection.getOutputStream().write(request.getBytes());