Refactoring of infobox implementation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@232 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 34 insertions, 535 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
index c7bb5205..aaa786a6 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
@@ -16,67 +16,14 @@
 */
 package at.gv.egiz.bku.slcommands.impl;

 

-import iaik.asn1.CodingException;
-import iaik.asn1.DerCoder;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
 
-import at.buergerkarte.namespaces.personenbindung._20020506_.CompressedIdentityLinkType;
-import at.buergerkarte.namespaces.securitylayer._1.AnyChildrenType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxAssocArrayPairType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadDataAssocArrayType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsBinaryFileType;
 import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadRequestType;
-import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadKeys;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadPairs;
-import at.buergerkarte.namespaces.securitylayer._1.InfoboxReadParamsAssocArrayType.ReadValue;
 import at.gv.egiz.bku.slcommands.InfoboxReadCommand;
-import at.gv.egiz.bku.slcommands.SLCommand;
 import at.gv.egiz.bku.slcommands.SLCommandContext;
 import at.gv.egiz.bku.slcommands.SLResult;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
-import at.gv.egiz.bku.slexceptions.SLRuntimeException;
-import at.gv.egiz.idlink.CompressedIdentityLinkFactory;
-import at.gv.egiz.idlink.IdentityLinkTransformer;
-import at.gv.egiz.idlink.ans1.IdentityLink;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-import at.gv.egiz.stal.STALRequest;
 

 /**

  * This class implements the security layer command

@@ -88,7 +35,7 @@ import at.gv.egiz.stal.STALRequest;
  * 

  * @author mcentner

  */

-public class InfoboxReadCommandImpl extends SLCommandImpl<InfoboxReadRequestType> implements

+public class InfoboxReadCommandImpl extends AbstractInfoboxCommandImpl<InfoboxReadRequestType> implements

     InfoboxReadCommand {

   

   /**

@@ -96,511 +43,63 @@ public class InfoboxReadCommandImpl extends SLCommandImpl<InfoboxReadRequestType
    */

   protected static Log log = LogFactory.getLog(InfoboxReadCommandImpl.class);
   
-  public static final String SEARCH_STRING_PATTERN = ".&&[^/](/.&&[^/])*";

-

-  public static final String INFOBOX_IDENTIFIER_CERTIFICATES = "Certificates";
-  
-  public static final String BOX_SPECIFIC_PARAMETER_IDENTITY_LINK_DOMAIN_IDENTIFIER = "IdentityLinkDomainIdentifier";
-  
-  public static final String INFOBOX_IDENTIFIER_IDENTITY_LINK = "IdentityLink";
-
-  public static final String[] INFOXBOX_CERTIFICATES_KEYS = new String[] {
-      "SecureSignatureKeypair", 
-      "CertifiedKeypair" };
-  
-  private static final int ASSOC_ARRAY_READ_KEYS = 1;
-  
-  private static final int ASSOC_ARRAY_READ_PAIRS = 2;
-  
-  private static final int ASSOC_ARRAY_READ_VALUE = 3;

-  
-  /**

-   * The <code>InfoboxIdentifier</code>

-   */

-  protected String infoboxIdentifier;

-  

-  /**

-   * The <code>IdentityLinkDomainIdentifier</code> value of an <code>IdentyLink</code> infobox.

-   */

-  protected String identityLinkDomainIdentifier;
-  
-  /**
-   * The list of certificates to be read from an <code>Certificates</code> infobox.
-   */
-  protected List<String> certificates;
-  
-  /**
-   * The result type.
-   */
-  protected int assocArrayResult;

-

-  /**

-   * Is content XML entity?

-   */

-  protected boolean isXMLEntity;

-  

   @Override

   public String getName() {

     return "InfoboxReadRequest";

   }

 

-  /**

-   * @return the infoboxIdentifier

-   */

-  public String getInfoboxIdentifier() {

-    return infoboxIdentifier;

-  }

-

+  @Override
+  protected String getInfoboxIdentifier(InfoboxReadRequestType request) {
+    return request.getInfoboxIdentifier();
+  }
+
   @Override

   public void init(SLCommandContext ctx, Object request) throws SLCommandException {

     super.init(ctx, request);

     

     InfoboxReadRequestType req = getRequestValue();

-    

-    infoboxIdentifier = req.getInfoboxIdentifier();

-    

-    if (INFOBOX_IDENTIFIER_IDENTITY_LINK.equals(infoboxIdentifier)) {

-      

-      if (req.getAssocArrayParameters() != null) {

-        log.info("Got AssocArrayParameters but Infobox type is BinaryFile.");

-        throw new SLCommandException(4010);

-      }

-      

-      InfoboxReadParamsBinaryFileType binaryFileParameters = req.getBinaryFileParameters();
-      if (binaryFileParameters != null) {
-        isXMLEntity = binaryFileParameters.isContentIsXMLEntity();
-        log.debug("Got ContentIsXMLEntity=" + isXMLEntity + ".");
-      }
-      

-      AnyChildrenType boxSpecificParameters = req.getBoxSpecificParameters();

-

-      if (boxSpecificParameters != null) {

-        // check BoxSpecificParameters

-        List<Object> parameter = boxSpecificParameters.getAny();

-        JAXBElement<?> element;

-        if (parameter != null 

-            && parameter.size() == 1 

-            && parameter.get(0) instanceof JAXBElement<?>

-            && SLCommand.NAMESPACE_URI.equals((element = (JAXBElement<?>) parameter.get(0)).getName().getNamespaceURI())

-            && BOX_SPECIFIC_PARAMETER_IDENTITY_LINK_DOMAIN_IDENTIFIER.equals(element.getName().getLocalPart())

-            && element.getValue() instanceof String) {

-          identityLinkDomainIdentifier = (String) element.getValue();

-          log.debug("Got sl:IdentityLinkDomainIdentifier: " + identityLinkDomainIdentifier);

-        } else {

-          log.info("Got invalid BoxSpecificParameters.");

-          throw new SLCommandException(4010);

-        }

-      }

     
-    } else if (INFOBOX_IDENTIFIER_CERTIFICATES.equals(infoboxIdentifier)) {
-      
-      if (req.getBinaryFileParameters() != null) {
-        log.info("Got BinaryFileParameters but Infobox type is AssocArray.");
-        throw new SLCommandException(4010);
-      }
-      
-      if (req.getBoxSpecificParameters() != null) {
-        log.info("Got invalid BoxSpecificParameters.");
-        throw new SLCommandException(4010);
-      }
-      
-      InfoboxReadParamsAssocArrayType assocArrayParameters = req
-          .getAssocArrayParameters();
-      if (assocArrayParameters == null) {
-        log.info("Infobox type is AssocArray but got no AssocArrayParameters.");
-        throw new SLCommandException(4010);
-      }
-      
-      // RreadKeys?
-      if (assocArrayParameters.getReadKeys() != null) {
-        assocArrayResult = ASSOC_ARRAY_READ_KEYS;
-        ReadKeys readKeys = assocArrayParameters.getReadKeys();
-        certificates = findCertificates(readKeys.getSearchString());
-        if (readKeys.isUserMakesUnique() && certificates.size() > 1) {
-          log.info("UserMakesUnique not supported");
-          // TODO: give more specific error message
-          throw new SLCommandException(4010);
-        }
-      }
-
-      // ReadPairs?
-      if (assocArrayParameters.getReadPairs() != null) {
-        assocArrayResult = ASSOC_ARRAY_READ_PAIRS;
-        ReadPairs readPairs = assocArrayParameters.getReadPairs();
-        if (readPairs.isValuesAreXMLEntities()) {
-          log.info("Got valuesAreXMLEntities but infobox type is binary.");
-          throw new SLCommandException(4010);
-        }
-        certificates = findCertificates(readPairs.getSearchString());
-        if (readPairs.isUserMakesUnique() && certificates.size() > 1) {
-          log.info("UserMakesUnique not supported");
-          // TODO: give more specific error message
-          throw new SLCommandException(4010);
-        }
-      }
-
-      // ReadValue
-      if (assocArrayParameters.getReadValue() != null) {
-        assocArrayResult = ASSOC_ARRAY_READ_VALUE;
-        ReadValue readValue = assocArrayParameters.getReadValue();
-        if (readValue.isValueIsXMLEntity()) {
-          log.info("Got valuesAreXMLEntities but infobox type is binary.");
-          throw new SLCommandException(4010);
-        }
-        String key = readValue.getKey();
-        if (Arrays.asList(INFOXBOX_CERTIFICATES_KEYS).contains(key)) {
-          certificates = Collections.singletonList(key);
-        } else {
-          certificates = Collections.emptyList();
-        }
-      }
-
-      if (assocArrayResult == 0) {
-        log.info("Infobox type is AssocArray but got invalid AssocArrayParameters.");
-        throw new SLCommandException(4010);
-      }
-      

-    } else {

-      throw new SLCommandException(4002,

-          SLExceptionMessages.EC4002_INFOBOX_UNKNOWN,

-          new Object[] { infoboxIdentifier });

-    }

+    if (req.getAssocArrayParameters() != null && 
+        !(infobox instanceof AssocArrayInfobox)) {
+      log.info("Got AssocArrayParameters but Infobox type is not AssocArray.");
+      throw new SLCommandException(4010);
+    }
+    
+    if (req.getBinaryFileParameters() != null &&
+        !(infobox instanceof BinaryFileInfobox)) {
+      log.info("Got BinaryFileParameters but Infobox type is not BinaryFile.");
+      throw new SLCommandException(4010);
+    }
     

   }

 

   @Override

   public SLResult execute() {
-    try {

-      if (INFOBOX_IDENTIFIER_IDENTITY_LINK.equals(infoboxIdentifier)) {
-        return readIdentityLink();
-      } else if (INFOBOX_IDENTIFIER_CERTIFICATES.equals(infoboxIdentifier)) {
-        return readCertificates();
-      } else {
-        throw new SLCommandException(4000);
-      }
-    } catch (SLCommandException e) {

-      return new ErrorResultImpl(e, cmdCtx.getLocale());

-    }

-  }

- 

-  /**

-   * Gets the IdentitiyLink form the next STAL response.

-   * 

-   * @return the IdentityLink

-   * 

-   * @throws SLCommandException if getting the IdentitiyLink fails

-   */

-  private IdentityLink getIdentityLinkFromResponses() throws SLCommandException {

-

-    // IdentityLink

-    InfoboxReadResponse response;

-    if (hasNextResponse()) {

-      response = (InfoboxReadResponse) nextResponse(InfoboxReadResponse.class);

-      byte[] idLink = response.getInfoboxValue();

-      try {

-        return new IdentityLink(DerCoder.decode(idLink));

-      } catch (CodingException e) {

-        log.info("Failed to decode infobox '" + INFOBOX_IDENTIFIER_IDENTITY_LINK + "'.", e);

-        throw new SLCommandException(4000,

-            SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,

-            new Object[] { INFOBOX_IDENTIFIER_IDENTITY_LINK });

-      }

-    } else {

-      log.info("No infobox '" + INFOBOX_IDENTIFIER_IDENTITY_LINK + "' returned from STAL.");

-      throw new SLCommandException(4000);

-    }

-    

-  }

-  

-  /**

-   * Gets the list of certificates from the next STAL responses.

-   * 

-   * @return the list of certificates

-   * 

-   * @throws SLCommandException if getting the list of certificates fails

-   */

-  private List<X509Certificate> getCertificatesFromResponses() throws SLCommandException {

-    

-    List<X509Certificate> certificates = new ArrayList<X509Certificate>();

-

-    CertificateFactory certFactory;

-    try {

-      certFactory = CertificateFactory.getInstance("X509");

-    } catch (CertificateException e) {

-      // we should always be able to get an X509 certificate factory

-      log.error("CertificateFactory.getInstance(\"X509\") failed.", e);

-      throw new SLRuntimeException(e);

-    }

-    

-    InfoboxReadResponse response;

-    while(hasNextResponse()) {

-      response = (InfoboxReadResponse) nextResponse(InfoboxReadResponse.class);

-      byte[] cert = response.getInfoboxValue();

-      try {

-        certificates.add((X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(cert)));

-      } catch (CertificateException e) {

-        log.info("Failed to decode certificate.", e);

-        throw new SLCommandException(4000,

-            SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,

-            new Object[] { INFOBOX_IDENTIFIER_CERTIFICATES });

-      }

-    }

-    

-    return certificates;

-

-  }

-

-  /**

-   * Uses STAL to read the IdentityLink.

-   * 

-   * @return the corresponding security layer result

-   * 

-   * @throws SLCommandException if reading the IdentityLink fails

-   */

-  private SLResult readIdentityLink() throws SLCommandException {

-    

-    List<STALRequest> stalRequests = new ArrayList<STALRequest>();

-

-    InfoboxReadRequest infoboxReadRequest;

-    // get raw identity link

-    infoboxReadRequest = new InfoboxReadRequest();

-    infoboxReadRequest.setInfoboxIdentifier(INFOBOX_IDENTIFIER_IDENTITY_LINK);

-    infoboxReadRequest.setDomainIdentifier(identityLinkDomainIdentifier);

-    stalRequests.add(infoboxReadRequest);

-    

-    // get certificates

-    infoboxReadRequest = new InfoboxReadRequest();

-    infoboxReadRequest.setInfoboxIdentifier("SecureSignatureKeypair");

-    stalRequests.add(infoboxReadRequest);

-    infoboxReadRequest = new InfoboxReadRequest();

-    infoboxReadRequest.setInfoboxIdentifier("CertifiedKeypair");

-    stalRequests.add(infoboxReadRequest);

-

-    requestSTAL(stalRequests);

-    log.trace("Got STAL response");

-

-    IdentityLink identityLink = getIdentityLinkFromResponses();

-    List<X509Certificate> certificates = getCertificatesFromResponses();

-    

-    

-    CompressedIdentityLinkFactory idLinkFactory = CompressedIdentityLinkFactory.getInstance();

-    JAXBElement<CompressedIdentityLinkType> compressedIdentityLink = idLinkFactory

-        .createCompressedIdentityLink(identityLink, certificates, identityLinkDomainIdentifier);

-

-    IdentityLinkTransformer identityLinkTransformer = IdentityLinkTransformer.getInstance();

-    String issuerTemplate = identityLink.getIssuerTemplate();

-    

-    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

-    DocumentBuilder db;

-    try {

-      db = dbf.newDocumentBuilder();

-    } catch (ParserConfigurationException e) {

-      log.error("Failed to create XML document.", e);

-      throw new SLRuntimeException(e);

-    }

-    

-    Document document = db.newDocument();

-    try {

-      idLinkFactory.marshallCompressedIdentityLink(compressedIdentityLink, document, null, true);

-    } catch (JAXBException e) {

-      log.info("Failed to marshall CompressedIdentityLink.", e);

-      throw new SLCommandException(4000,

-          SLExceptionMessages.EC4000_UNCLASSIFIED_INFOBOX_INVALID,

-          new Object[] { INFOBOX_IDENTIFIER_IDENTITY_LINK });

-    }

-    

-    InfoboxReadResultFileImpl result = new InfoboxReadResultFileImpl();

-    ByteArrayOutputStream resultBytes = null;

-    Result xmlResult = (isXMLEntity || identityLinkDomainIdentifier != null) 

-          ? result.getXmlResult(true) 

-          : new StreamResult((resultBytes = new ByteArrayOutputStream()));

+    
     try {
-      log.trace("Trying to transform identitylink");

-      identityLinkTransformer.transformIdLink(issuerTemplate, new DOMSource(document), xmlResult);
-    } catch (MalformedURLException e) {
-      log.warn("Malformed issuer template URL '" + issuerTemplate + "'.");
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    } catch (IOException e) {

-      log.warn("Failed to dereferene issuer template URL '" + issuerTemplate + "'." ,e);

-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    } catch (TransformerConfigurationException e) {
-      log.warn("Failed to create transformation template from issuer template URL '" + issuerTemplate + "'", e);
-      throw new SLCommandException(4000,
-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,
-          new Object[] { issuerTemplate });
-    } catch (TransformerException e) {

-      log.info("Faild to transform CompressedIdentityLink.", e);

-      throw new SLCommandException(4000,

-          SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-          new Object[] { issuerTemplate });

-    }

-    

-    // TODO: Report BUG in IssuerTemplates

-    // Some IssuerTemplate stylesheets do not consider the pr:Type-Element of the CompressedIdentityLink ...

-    if (identityLinkDomainIdentifier != null) {

-      if (xmlResult instanceof DOMResult) {

-        Node node = ((DOMResult) xmlResult).getNode();

-        Node nextSibling = ((DOMResult) xmlResult).getNextSibling();

-        Node idLinkNode;

-        if (nextSibling != null) {

-          idLinkNode = nextSibling.getPreviousSibling();

-        } else if (node != null) {

-          idLinkNode = node.getFirstChild();

-        } else {

-          log

-              .error("An IdentityLinkDomainIdentifier of '"

-                  + identityLinkDomainIdentifier

-                  + "' has been given. However, it cannot be set, as the transformation result does not contain a node.");

-          throw new SLCommandException(4000,

-              SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-              new Object[] { issuerTemplate });

-        }

-        IdentityLinkTransformer.setDomainIdentifier(idLinkNode, identityLinkDomainIdentifier);

-      } else {

-        log

-            .error("An IdentityLinkDomainIdentifier of '"

-                + identityLinkDomainIdentifier

-                + "' has been given. However, it cannot be set, as the transformation result is not of type DOM.");

-        throw new SLCommandException(4000,

-            SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-            new Object[] { issuerTemplate });

-      }

-    }

-    

-    if (!isXMLEntity) {

-      if (resultBytes == null) {

-        resultBytes = new ByteArrayOutputStream();

-

-        if (xmlResult instanceof DOMResult) {

-          Node node = ((DOMResult) xmlResult).getNode();

-          Node nextSibling = ((DOMResult) xmlResult).getNextSibling();

-          

-          DOMSource xmlSource;

-          if (nextSibling != null) {

-            xmlSource = new DOMSource(nextSibling.getPreviousSibling());

-          } else if (node != null) {

-            xmlSource = new DOMSource(node.getFirstChild());

-          } else {

-            log

-                .error("IssuerTemplate transformation returned no node.");

-            throw new SLCommandException(4000,

-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-                new Object[] { issuerTemplate });

-          }

-          TransformerFactory transformerFactory = TransformerFactory.newInstance();

-          try {

-            Transformer transformer = transformerFactory.newTransformer();

-            transformer.transform(xmlSource, new StreamResult(resultBytes));

-          } catch (TransformerConfigurationException e) {

-            log.error(e);

-            throw new SLCommandException(4000,

-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-                new Object[] { issuerTemplate });

-          } catch (TransformerException e) {

-            log.error(e);

-            throw new SLCommandException(4000,

-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-                new Object[] { issuerTemplate });

-          }

-        } else if (xmlResult instanceof StreamResult) {

-          OutputStream outputStream = ((StreamResult) xmlResult).getOutputStream();

-          if (outputStream instanceof ByteArrayOutputStream) {

-            result.setResultBytes(((ByteArrayOutputStream) outputStream).toByteArray());

-          } else {

-            log.error("ContentIsXMLEntity is set to 'false'. However, an XMLResult has already been set.");

-            throw new SLCommandException(4000,

-                SLExceptionMessages.EC4000_UNCLASSIFIED_IDLINK_TRANSFORMATION_FAILED,

-                new Object[] { issuerTemplate });

-          }

-        }

-      } else {

-        result.setResultBytes(resultBytes.toByteArray());

-      }

-    }

-    

-    

-    return result;

-    

-  }
-  
-  protected List<String> findCertificates(String searchString) throws SLCommandException {
-
-    if ("*".equals(searchString) || "**".equals(searchString)) {
-      return Arrays.asList(INFOXBOX_CERTIFICATES_KEYS);
+      return infobox.read(getRequestValue(), getCmdCtx());
+    } catch (SLCommandException e) {
+      return new ErrorResultImpl(e, getCmdCtx().getLocale());
     }
     
-    if (Pattern.matches(SEARCH_STRING_PATTERN, searchString)) {
-      
-//      for (int i = 0; i < searchString.length(); i++) {
-//        int codePoint = searchString.codePointAt(i);
-//        
-//      }
-      
-      // TODO : build pattern
-      return Collections.emptyList();
+  }

+ 

+

+  @Override
+  public String getIdentityLinkDomainId() {
+    if (infobox instanceof IdentityLinkInfoboxImpl) {
+      return ((IdentityLinkInfoboxImpl) infobox).getDomainIdentifier();
     } else {
-      log.info("Got invalid search string '" + searchString + "'");
-      throw new SLCommandException(4010);
+      return null;
     }
-    
   }
 
-  private SLResult readCertificates() throws SLCommandException {
-    
-    ObjectFactory objectFactory = new ObjectFactory();
-    
-    InfoboxReadDataAssocArrayType infoboxReadDataAssocArrayType = objectFactory
-        .createInfoboxReadDataAssocArrayType();
-
-    if (assocArrayResult == ASSOC_ARRAY_READ_KEYS) {
-
-      List<String> keys = infoboxReadDataAssocArrayType.getKey();
-      keys.addAll(certificates);
-      
+  @Override
+  public String getInfoboxIdentifier() {
+    if (infobox != null) {
+      return infobox.getIdentifier();
     } else {
-
-      if (certificates != null && !certificates.isEmpty()) {
-        
-        List<STALRequest> stalRequests = new ArrayList<STALRequest>();
-
-        // get certificates
-        InfoboxReadRequest infoboxReadRequest;
-        for (int i = 0; i < certificates.size(); i++) {
-          infoboxReadRequest = new InfoboxReadRequest();
-          infoboxReadRequest.setInfoboxIdentifier(certificates.get(i));
-          stalRequests.add(infoboxReadRequest);
-        }
-
-        requestSTAL(stalRequests);
-
-        List<X509Certificate> x509Certs = getCertificatesFromResponses();
-
-        for (int i = 0; i < certificates.size(); i++) {
-          InfoboxAssocArrayPairType infoboxAssocArrayPairType = objectFactory.createInfoboxAssocArrayPairType();
-          infoboxAssocArrayPairType.setKey(certificates.get(i));
-          try {
-            infoboxAssocArrayPairType.setBase64Content(x509Certs.get(i).getEncoded());
-          } catch (CertificateEncodingException e) {
-            log.error("Failed to encode certificate.", e);
-            throw new SLCommandException(4000);
-          }
-          infoboxReadDataAssocArrayType.getPair().add(infoboxAssocArrayPairType);
-        }
-        
-      }
-      
+      return null;
     }
-    
-    return new InfoboxReadResultImpl(infoboxReadDataAssocArrayType);
-    
-  }
-  
-  @Override
-  public String getIdentityLinkDomainId() {
-    return identityLinkDomainIdentifier;
   }
 }