Attachment 598471 Details for Bug 840512 – patch for obfuscation issue with content source.

patch for obfuscation issue with content source.

commit-BZ-840512-2c6836e.txt (text/plain), 2.10 KB, created by Simeon Pinder on 2012-07-16 14:51:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simeon Pinder

Created: 2012-07-16 14:51:28 UTC

Size: 2.10 KB

patch

obsolete

>commit 2c6836e36a475114ddd18419e6ca98fa8d5c2edc
>Author: Simeon Pinder <spinder@redhat.com>
>Date:   Mon Jul 16 10:44:36 2012 -0400
>
>     [BZ 840512] workaround bug in persistence container.
>
>diff --git a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java
>index 2758e2b..85a940d 100644
>--- a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java
>+++ b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java
>@@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFactory;
> 
> import org.rhq.core.domain.configuration.Configuration;
> import org.rhq.core.domain.configuration.PropertySimple;
>+import org.rhq.core.util.obfuscation.Obfuscator;
> import org.rhq.enterprise.server.plugin.pc.content.ContentProvider;
> import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
> import org.rhq.enterprise.server.plugin.pc.content.PackageSource;
>@@ -220,6 +221,14 @@ public class JBossSoftwareContentSourceAdapter implements ContentProvider, Packa
> 
>             int status = client.executeMethod(method);
> 
>+            //BZ840512: check for issue deobfuscating the password:
>+            if (status == 401 || status == 403) {
>+                password = Obfuscator.encode(password);//in case de/unobfuscation failed.
>+                UsernamePasswordCredentials upc = new UsernamePasswordCredentials(username, password);
>+                client.getState().setCredentials("users", method.getHostConfiguration().getHost(), upc);
>+                status = client.executeMethod(method);
>+            }
>+
>             //Check to see if redirection has occurred
>             String currentUrl = method.getURI().getURI();
>             //if redirection has occurred, reconnect with correct address.

Actions: View

Attachments on bug 840512: 598471 | 598520 | 599182 | 599552