Changeset 9430 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java

Timestamp:

Feb 28, 2011, 7:40:53 PM (13 years ago)

Author:

mlg

Message:

Modifications to handle proxy error.
Two types of error are handled : proxy address error and proxy authentication error.
Connecting to jiwigo via a proxy seems to work (tried with my own server... gonna have to try with an external server).
version is 0.13.1.1

File:

• extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java (modified) (9 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java

@@ -8 +8 @@
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
@@ -18 +17 @@
 
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.util.Tools;
 
@@ -125 +125 @@
     /**
      * Connection method
-     * @return true if successful
-     */
-    public boolean processLogin() {
+     *
+     * @return 0 if Ok, 1 if not Ok (reason not specified), 2 if proxy error
+     *
+     *
+     */
+    public int processLogin() {
         Document doc;
         //configures the proxy
@@ -139 +142 @@
             }
         }
+        //      try {
         try {
             doc = executeReturnDocument(MethodsEnum.LOGIN.getLabel(), "username", login, "password", password);
-            return Tools.checkOk(doc);
+            return (Tools.checkOk(doc) ? 0 : 1);
+        } catch (IOException e) {
+            LOG.debug(Tools.getStackTrace(e));
+            return 1;
+        } catch (ProxyAuthenticationException e) {
+            LOG.debug(Tools.getStackTrace(e));
+            return 2;
         } catch (Exception e) {
-            LOG.error(Tools.getStackTrace(e));
-        }
-        return false;
+            LOG.debug(Tools.getStackTrace(e));
+            return 1;
+        }
+
     }
 
@@ -154 +165 @@
      * @return the result
      * @throws UnsupportedEncodingException
-     */
-    public String executeReturnString(String methode, String... parametres) throws UnsupportedEncodingException {
+     * @throws ProxyAuthenticationException
+     */
+    public String executeReturnString(String methode, String... parametres) throws UnsupportedEncodingException,
+            ProxyAuthenticationException {
         if (parametres.length % 2 != 0 && !(parametres == null)) {
             try {
@@ -174 +187 @@
         method.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
         //end
-
         try {
-            client.executeMethod(method);
+            int test = client.executeMethod(method);
+            if (test == 407) {
+                throw new ProxyAuthenticationException("Proxy configuration exception. Check username and password");
+            }
             InputStream streamResponse = method.getResponseBodyAsStream();
             //      System.out.println(Outil.readInputStreamAsString(streamResponse));
@@ -183 +198 @@
             LOG.debug(toReturn);
             return toReturn;
-        } catch (HttpException e) {
-            // TODO Auto-generated catch block
-            LOG.error(Tools.getStackTrace(e));
         } catch (IOException e) {
-            // TODO Auto-generated catch block
-            LOG.error(Tools.getStackTrace(e));
-        } catch (IllegalArgumentException e) {
-            LOG.error(Tools.getStackTrace(e));
-        } finally {
-            method.releaseConnection();
+
         }
         return null;
@@ -204 +211 @@
      * @return the result
      * @throws IOException
-     */
-    public Document executeReturnDocument(String methode, String... parametres) throws IOException {
+     * @throws ProxyAuthenticationException
+     */
+    public Document executeReturnDocument(String methode, String... parametres) throws IOException,
+            ProxyAuthenticationException {
         try {
-            return Tools.stringToDocument(executeReturnString(methode, parametres));
+            String returnedString = executeReturnString(methode, parametres);
+            return Tools.stringToDocument(returnedString);
         } catch (JDOMException e) {
             // TODO Auto-generated catch block
@@ -220 +230 @@
      * @param methode the method to execute
      * @return the result
-     */
-    public Document executeReturnDocument(String methode) {
+     * @throws ProxyAuthenticationException
+     */
+    public Document executeReturnDocument(String methode) throws ProxyAuthenticationException {
         try {
             return Tools.stringToDocument(executeReturnString(methode));