Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway
Modified Files: ParseValue.java gatewayHandler.java Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none
Index: ParseValue.java =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ParseValue.java 19 Apr 2005 22:07:19 -0000 1.4 +++ ParseValue.java 10 Feb 2006 23:21:54 -0000 1.5 @@ -36,6 +36,8 @@ * --- END COPYRIGHT BLOCK --- */ package com.netscape.dsml.gateway;
+import org.apache.commons.codec.binary.Base64; + /** * * @author elliot @@ -53,9 +55,9 @@ org.w3c.dom.Node type = n.getAttributes().getNamedItem("xsi:type"); if (type != null && type.getNodeValue().equalsIgnoreCase("xsd:base64Binary") ) { // This value is encoded in base64. decode it. - sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder(); + Base64 bd = new Base64(); try { - ret = bd.decodeBuffer( n.getFirstChild().getNodeValue() ) ; + ret = bd.decode( n.getFirstChild().getNodeValue().getBytes() ) ; } catch (org.w3c.dom.DOMException de) { ret = "".getBytes();
Index: gatewayHandler.java =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gatewayHandler.java 11 May 2005 04:29:55 -0000 1.8 +++ gatewayHandler.java 10 Feb 2006 23:21:54 -0000 1.9 @@ -62,6 +62,7 @@ import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.handlers.BasicHandler; +import org.apache.commons.codec.binary.Base64;
public class gatewayHandler extends BasicHandler { private HandlerInfo handlerInfo; @@ -110,9 +111,9 @@ if ( tmp != null && tmp.startsWith("Basic ") ) {
int i ; - sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder(); + Base64 bd = new Base64(); try { - tmp = new String( (bd.decodeBuffer(tmp.substring(6) ))); + tmp = new String( (bd.decode(tmp.substring(6).getBytes() ))); } catch (Exception e) { // couldn't decode auth info
389-commits@lists.fedoraproject.org