Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 101 insertions, 110 deletions

diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
index 212f7237..c08ec849 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
+++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.publish.mappers;
 
+
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.Locale;
@@ -44,17 +45,19 @@ import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.publish.ILdapMapper;
 import com.netscape.certsrv.request.IRequest;
 
-/**
- * Maps a request to an entry in the LDAP server. Takes a dnPattern to form the
- * baseDN from the request attributes and certificate subject name.Do a base
- * search for the entry in the directory to publish the cert or crl. The
- * restriction of this mapper is that the ldap dn components must be part of
- * certificate subject name or request attributes or constant.
- * 
+
+/** 
+ * Maps a request to an entry in the LDAP server.
+ * Takes a dnPattern to form the baseDN from the request attributes
+ * and certificate subject name.Do a base search for the entry 
+ * in the directory to publish the cert or crl.
+ * The restriction of this mapper is that the ldap dn components must
+ * be part of certificate subject name or request attributes or constant.
+ *
  * @version $Revision$, $Date$
  */
 public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
-    protected static final String PROP_DNPATTERN = "dnPattern";
+    protected static final String PROP_DNPATTERN = "dnPattern";  
     protected String mDnPattern = null;
 
     private ILogger mLogger = CMS.getLogger();
@@ -64,28 +67,28 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
     /* the subject DN pattern */
     protected MapDNPattern mPattern = null;
 
-    /* the list of request attriubutes to retrieve */
+    /* the list of request attriubutes to retrieve*/
     protected String[] mReqAttrs = null;
 
-    /* the list of cert attriubutes to retrieve */
+    /* the list of cert attriubutes to retrieve*/
     protected String[] mCertAttrs = null;
 
     /* default dn pattern if left blank or not set in the config */
-    public static final String DEFAULT_DNPATTERN = "UID=$req.HTTP_PARAMS.UID,  OU=people, O=$subj.o, C=$subj.c";
+    public static final String DEFAULT_DNPATTERN = 
+        "UID=$req.HTTP_PARAMS.UID,  OU=people, O=$subj.o, C=$subj.c";
 
-    /**
+    /** 
      * Constructor.
-     * 
-     * @param dnPattern The base DN.
+     *
+     * @param dnPattern The base DN. 
      */
     public LdapSimpleMap(String dnPattern) {
         try {
             init(dnPattern);
         } catch (EBaseException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         }
-
+		
     }
 
     /**
@@ -96,16 +99,15 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
 
     public String[] getExtendedPluginInfo(Locale locale) {
         String params[] = {
-                "dnPattern;string;Describes how to form the Ldap Subject name in"
-                        + " the directory.  Example 1:  'uid=CertMgr, o=Fedora'.  Example 2:"
-                        + " 'uid=$req.HTTP_PARAMS.uid, E=$ext.SubjectAlternativeName.RFC822Name, ou=$subj.ou'. "
-                        + "$req means: take the attribute from the request. "
-                        + "$subj means: take the attribute from the certificate subject name. "
-                        + "$ext means: take the attribute from the certificate extension",
-                IExtendedPluginInfo.HELP_TOKEN
-                        + ";configuration-ldappublish-mapper-simplemapper",
-                IExtendedPluginInfo.HELP_TEXT
-                        + ";Describes how to form the LDAP DN of the entry to publish to" };
+                "dnPattern;string;Describes how to form the Ldap Subject name in" +
+                " the directory.  Example 1:  'uid=CertMgr, o=Fedora'.  Example 2:" +
+                " 'uid=$req.HTTP_PARAMS.uid, E=$ext.SubjectAlternativeName.RFC822Name, ou=$subj.ou'. " + 
+                "$req means: take the attribute from the request. " + 
+                "$subj means: take the attribute from the certificate subject name. " + 
+                "$ext means: take the attribute from the certificate extension",
+                IExtendedPluginInfo.HELP_TOKEN + ";configuration-ldappublish-mapper-simplemapper",
+                IExtendedPluginInfo.HELP_TEXT + ";Describes how to form the LDAP DN of the entry to publish to"
+            };
 
         return params;
     }
@@ -114,10 +116,11 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
         return mConfig;
     }
 
-    /**
+    /** 
      * for initializing from config store.
      */
-    public void init(IConfigStore config) throws EBaseException {
+    public void init(IConfigStore config) 
+        throws EBaseException {
         mConfig = config;
         String dnPattern = mConfig.getString(PROP_DNPATTERN);
 
@@ -127,51 +130,52 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
     /**
      * common initialization routine.
      */
-    protected void init(String dnPattern) throws EBaseException {
-        if (mInited)
+    protected void init(String dnPattern)
+        throws EBaseException {
+        if (mInited) 
             return;
 
         mDnPattern = dnPattern;
-        if (mDnPattern == null || mDnPattern.length() == 0)
+        if (mDnPattern == null || mDnPattern.length() == 0) 
             mDnPattern = DEFAULT_DNPATTERN;
         try {
             mPattern = new MapDNPattern(mDnPattern);
             String[] mReqAttrs = mPattern.getReqAttrs();
             String[] mCertAttrs = mPattern.getCertAttrs();
         } catch (ELdapException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("PUBLISH_DN_PATTERN_INIT", dnPattern,
-                            e.toString()));
-            throw new EBaseException("falied to init with pattern " + dnPattern
-                    + " " + e);
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_DN_PATTERN_INIT",
+                    dnPattern, e.toString()));
+            throw new EBaseException("falied to init with pattern " + 
+                    dnPattern + " " + e);
         }
 
         mInited = true;
     }
 
     /**
-     * Maps a X500 subject name to LDAP entry. Uses DN pattern to form a DN for
-     * a LDAP base search.
+     * Maps a X500 subject name to LDAP entry.
+     * Uses DN pattern to form a DN for a LDAP base search.
      * 
-     * @param conn the LDAP connection.
-     * @param obj the object to map.
+     * @param conn	the LDAP connection.
+     * @param obj   the object to map.
      * @exception ELdapException if any LDAP exceptions occured.
-     */
-    public String map(LDAPConnection conn, Object obj) throws ELdapException {
+     */ 
+    public String map(LDAPConnection conn, Object obj)
+        throws ELdapException {
         return map(conn, null, obj);
     }
 
     /**
-     * Maps a X500 subject name to LDAP entry. Uses DN pattern to form a DN for
-     * a LDAP base search.
+     * Maps a X500 subject name to LDAP entry.
+     * Uses DN pattern to form a DN for a LDAP base search.
      * 
-     * @param conn the LDAP connection.
-     * @param req the request to map.
-     * @param obj the object to map.
+     * @param conn	the LDAP connection.
+     * @param req  	the request to map.
+     * @param obj   the object to map.
      * @exception ELdapException if any LDAP exceptions occured.
-     */
+     */ 
     public String map(LDAPConnection conn, IRequest req, Object obj)
-            throws ELdapException {
+        throws ELdapException {
         if (conn == null)
             return null;
         String dn = null;
@@ -179,14 +183,13 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
         try {
             dn = formDN(req, obj);
             if (dn == null) {
-                log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("PUBLISH_DN_NOT_FORMED"));
+                log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_DN_NOT_FORMED"));
                 String s1 = "";
 
                 if (req != null)
                     s1 = req.getRequestId().toString();
-                throw new ELdapException(CMS.getUserMessage(
-                        "CMS_LDAP_NO_DN_MATCH", s1));
+                throw new ELdapException(
+                        CMS.getUserMessage("CMS_LDAP_NO_DN_MATCH", s1));
             }
             int scope = LDAPv2.SCOPE_BASE;
             String filter = "(objectclass=*)";
@@ -195,28 +198,24 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
             String[] attrs = new String[] { LDAPv3.NO_ATTRS };
 
             log(ILogger.LL_INFO, "searching for dn: " + dn + " filter:"
-                    + filter + " scope: base");
+                + filter + " scope: base");
 
-            LDAPSearchResults results = conn.search(dn, scope, filter, attrs,
-                    false);
+            LDAPSearchResults results = 
+                conn.search(dn, scope, filter, attrs, false);
             LDAPEntry entry = results.next();
 
             if (results.hasMoreElements()) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage(
-                        "PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? ""
-                                : req.getRequestId().toString())));
-                throw new ELdapException(CMS.getUserMessage(
-                        "CMS_LDAP_MORE_THAN_ONE_ENTRY", ((req == null) ? ""
-                                : req.getRequestId().toString())));
+                log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : req.getRequestId().toString()))); 
+                throw new ELdapException(CMS.getUserMessage("CMS_LDAP_MORE_THAN_ONE_ENTRY", 
+                            ((req == null) ? "" : req.getRequestId().toString()))); 
             }
             if (entry != null)
                 return entry.getDN();
             else {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage(
-                        "PUBLISH_ENTRY_NOT_FOUND", dn, ((req == null) ? ""
-                                : req.getRequestId().toString())));
-                throw new ELdapException(CMS.getUserMessage(
-                        "CMS_LDAP_NO_MATCH_FOUND", "null entry"));
+                log(ILogger.LL_FAILURE, 
+                    CMS.getLogMessage("PUBLISH_ENTRY_NOT_FOUND", dn, ((req == null) ? "" : req.getRequestId().toString())));
+                throw new ELdapException(CMS.getUserMessage("CMS_LDAP_NO_MATCH_FOUND",
+                            "null entry"));
             }
         } catch (ELdapException e) {
             throw e;
@@ -225,69 +224,61 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
                 // need to intercept this because message from LDAP is
                 // "DSA is unavailable" which confuses with DSA PKI.
                 log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("PUBLISH_NO_LDAP_SERVER"));
-                throw new ELdapServerDownException(CMS.getUserMessage(
-                        "CMS_LDAP_SERVER_UNAVAILABLE", conn.getHost(), ""
-                                + conn.getPort()));
+                    CMS.getLogMessage("PUBLISH_NO_LDAP_SERVER"));
+                throw new ELdapServerDownException(CMS.getUserMessage("CMS_LDAP_SERVER_UNAVAILABLE", conn.getHost(), "" + conn.getPort()));
             } else {
-                log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("PUBLISH_DN_MAP_EXCEPTION", "",
-                                e.toString()));
-                throw new ELdapException(CMS.getUserMessage(
-                        "CMS_LDAP_NO_MATCH_FOUND", e.toString()));
+                log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_DN_MAP_EXCEPTION", "", e.toString()));
+                throw new ELdapException(CMS.getUserMessage("CMS_LDAP_NO_MATCH_FOUND", e.toString()));
             }
         } catch (EBaseException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("PUBLISH_EXCEPTION_CAUGHT", e.toString()));
-            throw new ELdapException(CMS.getUserMessage(
-                    "CMS_LDAP_NO_MATCH_FOUND", e.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_EXCEPTION_CAUGHT", e.toString()));
+            throw new ELdapException(CMS.getUserMessage("CMS_LDAP_NO_MATCH_FOUND", e.toString()));
         }
     }
 
     /**
      * form a dn from component in the request and cert subject name
-     * 
      * @param req The request
      * @param obj The certificate or crl
      */
-    private String formDN(IRequest req, Object obj) throws EBaseException,
-            ELdapException {
+    private String formDN(IRequest req, Object obj) throws
+            EBaseException, ELdapException {
         X500Name subjectDN = null;
         CertificateExtensions certExt = null;
 
         try {
             X509Certificate cert = (X509Certificate) obj;
 
-            subjectDN = (X500Name) ((X509Certificate) cert).getSubjectDN();
+            subjectDN = 
+                    (X500Name) ((X509Certificate) cert).getSubjectDN();
 
             CMS.debug("LdapSimpleMap: cert subject dn:" + subjectDN.toString());
-            // certExt = (CertificateExtensions)
-            // ((X509CertImpl)cert).get(X509CertInfo.EXTENSIONS);
-            X509CertInfo info = (X509CertInfo) ((X509CertImpl) cert)
-                    .get(X509CertImpl.NAME + "." + X509CertImpl.INFO);
-
-            certExt = (CertificateExtensions) info
-                    .get(CertificateExtensions.NAME);
+            //certExt = (CertificateExtensions)
+            //        ((X509CertImpl)cert).get(X509CertInfo.EXTENSIONS);
+            X509CertInfo info = (X509CertInfo)
+                ((X509CertImpl) cert).get(
+                    X509CertImpl.NAME + "." + X509CertImpl.INFO);
+
+            certExt = (CertificateExtensions) info.get(
+                        CertificateExtensions.NAME);
         } catch (java.security.cert.CertificateParsingException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("PUBLISH_CANT_GET_EXT", e.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_EXT", e.toString()));
         } catch (IOException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("PUBLISH_CANT_GET_EXT", e.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_EXT", e.toString()));
         } catch (java.security.cert.CertificateException e) {
-            log(ILogger.LL_FAILURE,
-                    CMS.getLogMessage("PUBLISH_CANT_GET_EXT", e.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_EXT", e.toString()));
         } catch (ClassCastException e) {
             try {
                 X509CRLImpl crl = (X509CRLImpl) obj;
 
-                subjectDN = (X500Name) ((X509CRLImpl) crl).getIssuerDN();
+                subjectDN = 
+                        (X500Name) ((X509CRLImpl) crl).getIssuerDN();
 
-                CMS.debug("LdapSimpleMap: crl issuer dn: "
-                        + subjectDN.toString());
-            } catch (ClassCastException ex) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage(
-                        "PUBLISH_PUBLISH_OBJ_NOT_SUPPORTED",
+                CMS.debug("LdapSimpleMap: crl issuer dn: " +
+                    subjectDN.toString());
+            }catch (ClassCastException ex) {
+                log(ILogger.LL_FAILURE, 
+                    CMS.getLogMessage("PUBLISH_PUBLISH_OBJ_NOT_SUPPORTED", 
                         ((req == null) ? "" : req.getRequestId().toString())));
                 return null;
             }
@@ -298,8 +289,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
             return dn;
         } catch (ELdapException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_FORM_DN",
-                    ((req == null) ? "" : req.getRequestId().toString()),
-                    e.toString()));
+                    ((req == null) ? "" : req.getRequestId().toString()), e.toString()));
             throw e;
         }
     }
@@ -325,9 +315,9 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
         try {
             if (mDnPattern == null) {
                 v.addElement(PROP_DNPATTERN + "=");
-            } else {
-                v.addElement(PROP_DNPATTERN + "="
-                        + mConfig.getString(PROP_DNPATTERN));
+            }else {
+                v.addElement(PROP_DNPATTERN + "=" +
+                    mConfig.getString(PROP_DNPATTERN));
             }
         } catch (Exception e) {
         }
@@ -336,7 +326,8 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
 
     private void log(int level, String msg) {
         mLogger.log(ILogger.EV_SYSTEM, ILogger.S_LDAP, level,
-                "LdapSimpleMapper: " + msg);
+            "LdapSimpleMapper: " + msg);
     }
 
 }
+