div. changes for A-Trust Activation Support (User-Agent header, GetStatusRequest, ...)

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

6 files changed, 487 insertions, 306 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java
new file mode 100644
index 00000000..19099b63
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package at.gv.egiz.bku.slcommands;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface GetStatusCommand extends SLCommand {
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java
new file mode 100644
index 00000000..c5518f51
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package at.gv.egiz.bku.slcommands;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface GetStatusResult extends SLResult {
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
index bec2b253..1ef94e81 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandFactory.java
@@ -14,10 +14,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.slcommands;

-

+package at.gv.egiz.bku.slcommands;
+
 import java.io.IOException;
-import java.io.Reader;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -42,7 +41,6 @@ import org.apache.commons.logging.LogFactory;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import at.buergerkarte.namespaces.cardchannel.ObjectFactory;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLExceptionMessages;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
@@ -50,38 +48,38 @@ import at.gv.egiz.bku.slexceptions.SLRuntimeException;
 import at.gv.egiz.bku.utils.DebugReader;
 import at.gv.egiz.slbinding.RedirectEventFilter;
 import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
-

-public class SLCommandFactory {

-

-    /**

-     * Schema files required for Security Layer command validation.

-     */

-    public static final String[] SCHEMA_FILES = new String[]{

-        "at/gv/egiz/bku/slcommands/schema/xml.xsd",

-        "at/gv/egiz/bku/slcommands/schema/xmldsig-core-schema.xsd",

-        "at/gv/egiz/bku/slcommands/schema/Core-1.2.xsd"

-    };

-    /**

-     * Logging facility.

-     */

-    static Log log = LogFactory.getLog(SLCommandFactory.class);

-    /**

-     * The instance returned by {@link #getInstance()}.

-     */

-    private static SLCommandFactory instance;

-    /**

-     * Schema for Security Layer command validation.

-     */

-    private Schema slSchema;

-    /**

-     * The JAXBContext.

-     */

-    private JAXBContext jaxbContext;

-    /**

-     * The map of <namespaceURI>:<localName> to implementation class of the

-     * corresponding {@link SLCommand}.

-     */

-    private Map<String, Class<? extends SLCommand>> slRequestTypeMap = new HashMap<String, Class<? extends SLCommand>>();

+
+public class SLCommandFactory {
+
+    /**
+     * Schema files required for Security Layer command validation.
+     */
+    public static final String[] SCHEMA_FILES = new String[]{
+        "at/gv/egiz/bku/slcommands/schema/xml.xsd",
+        "at/gv/egiz/bku/slcommands/schema/xmldsig-core-schema.xsd",
+        "at/gv/egiz/bku/slcommands/schema/Core-1.2.xsd"
+    };
+    /**
+     * Logging facility.
+     */
+    static Log log = LogFactory.getLog(SLCommandFactory.class);
+    /**
+     * The instance returned by {@link #getInstance()}.
+     */
+    private static SLCommandFactory instance;
+    /**
+     * Schema for Security Layer command validation.
+     */
+    private Schema slSchema;
+    /**
+     * The JAXBContext.
+     */
+    private JAXBContext jaxbContext;
+    /**
+     * The map of <namespaceURI>:<localName> to implementation class of the
+     * corresponding {@link SLCommand}.
+     */
+    private Map<String, Class<? extends SLCommand>> slRequestTypeMap = new HashMap<String, Class<? extends SLCommand>>();
     
     /**
      * Configures the singleton instance with command implementations
@@ -96,239 +94,239 @@ public class SLCommandFactory {
         log.debug("Registering sl command implementation for :"+key+ "; implementation class: "+impl.getCanonicalName());
         slRequestTypeMap.put(key, impl);
       }
-    }

-

-    /**

-     * Register an {@link SLCommand} implementation class of a Security Layer

-     * command with the given <code>namespaceUri</code> and <code>localname</code>

-     * .

-     * 

-     * @param namespaceUri

-     *          the namespace URI of the Security Layer command

-     * @param localname

-     *          the localname of the Security Layer command

-     * @param slCommandClass

-     *          the implementation class, or <code>null</code> to deregister a

-     *          currently registered class

-     */

-    public  void setImplClass(String namespaceUri, String localname,

-      Class<? extends SLCommand> slCommandClass) {

-        if (slCommandClass != null) {

-            slRequestTypeMap.put(namespaceUri + ":" + localname, slCommandClass);

-        } else {

-            slRequestTypeMap.remove(namespaceUri + ":" + localname);

-        }

-    }

-

-    /**

-     * Returns the implementation class of an {@link SLCommand} with the given

-     * <code>name</code>, or <code>null</code> if no such class is registered.

-     * 

-     * @param name

-     *          the <code>QName</code> of the Security Layer command

-     * @return the implementation class, or <code>null</code> if no class is

-     *         registered for the given <code>name</code>

-     */

-    public Class<? extends SLCommand> getImplClass(QName name) {

-        String namespaceURI = name.getNamespaceURI();

-        String localPart = name.getLocalPart();

-        return slRequestTypeMap.get(namespaceURI + ":" + localPart);

-    }

-

-    /**

-     * Sets the schema to validate Security Layer commands with.

-     * 

-     * @param slSchema the schema to validate Security Layer commands with

-     */

-    public void setSLSchema(Schema slSchema) {

-        this.slSchema = slSchema;

-    }

-

-    /**

-     * @return the jaxbContext

-     */

-    public JAXBContext getJaxbContext() {

-        ensureJaxbContext();

-        return jaxbContext;

-    }

-

-    /**

-     * @param jaxbContext the jaxbContext to set

-     */

-    public  void setJaxbContext(JAXBContext jaxbContext) {

-        this.jaxbContext = jaxbContext;

-    }

-

-    /**

-     * Initialize the JAXBContext.

-     */

-    private synchronized void ensureJaxbContext() {

-        if (jaxbContext == null) {

-            try {

-                String slPkg = at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName();

+    }
+
+    /**
+     * Register an {@link SLCommand} implementation class of a Security Layer
+     * command with the given <code>namespaceUri</code> and <code>localname</code>
+     * .
+     * 
+     * @param namespaceUri
+     *          the namespace URI of the Security Layer command
+     * @param localname
+     *          the localname of the Security Layer command
+     * @param slCommandClass
+     *          the implementation class, or <code>null</code> to deregister a
+     *          currently registered class
+     */
+    public  void setImplClass(String namespaceUri, String localname,
+      Class<? extends SLCommand> slCommandClass) {
+        if (slCommandClass != null) {
+            slRequestTypeMap.put(namespaceUri + ":" + localname, slCommandClass);
+        } else {
+            slRequestTypeMap.remove(namespaceUri + ":" + localname);
+        }
+    }
+
+    /**
+     * Returns the implementation class of an {@link SLCommand} with the given
+     * <code>name</code>, or <code>null</code> if no such class is registered.
+     * 
+     * @param name
+     *          the <code>QName</code> of the Security Layer command
+     * @return the implementation class, or <code>null</code> if no class is
+     *         registered for the given <code>name</code>
+     */
+    public Class<? extends SLCommand> getImplClass(QName name) {
+        String namespaceURI = name.getNamespaceURI();
+        String localPart = name.getLocalPart();
+        return slRequestTypeMap.get(namespaceURI + ":" + localPart);
+    }
+
+    /**
+     * Sets the schema to validate Security Layer commands with.
+     * 
+     * @param slSchema the schema to validate Security Layer commands with
+     */
+    public void setSLSchema(Schema slSchema) {
+        this.slSchema = slSchema;
+    }
+
+    /**
+     * @return the jaxbContext
+     */
+    public JAXBContext getJaxbContext() {
+        ensureJaxbContext();
+        return jaxbContext;
+    }
+
+    /**
+     * @param jaxbContext the jaxbContext to set
+     */
+    public  void setJaxbContext(JAXBContext jaxbContext) {
+        this.jaxbContext = jaxbContext;
+    }
+
+    /**
+     * Initialize the JAXBContext.
+     */
+    private synchronized void ensureJaxbContext() {
+        if (jaxbContext == null) {
+            try {
+                String slPkg = at.buergerkarte.namespaces.securitylayer._1.ObjectFactory.class.getPackage().getName();
                 String xmldsigPkg = org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
                 String cardChannelPkg = at.buergerkarte.namespaces.cardchannel.ObjectFactory.class.getPackage().getName();
-                setJaxbContext(JAXBContext.newInstance(slPkg + ":" + xmldsigPkg + ":" + cardChannelPkg));

-            } catch (JAXBException e) {

-                log.error("Failed to setup JAXBContext security layer request.", e);

-                throw new SLRuntimeException(e);

-            }

-        }

-    }

-

-    /**

-     * Initialize the security layer schema.

-     */

-    private synchronized void ensureSchema() {

-        if (slSchema == null) {

-            try {

-                SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);

-                ClassLoader cl = SLCommandFactory.class.getClassLoader();

-                Source[] sources = new Source[SCHEMA_FILES.length];

-                for (int i = 0; i < SCHEMA_FILES.length; i++) {

-                    String schemaFile = SCHEMA_FILES[i];

-                    URL schemaURL = cl.getResource(schemaFile);

-                    if (schemaURL == null) {

-                        throw new SLRuntimeException("Failed to load schema file " + schemaFile + ".");

-                    }

-                    log.debug("Schema location: " + schemaURL);

-                    sources[i] = new StreamSource(schemaURL.openStream());

-                }

-                Schema schema = schemaFactory.newSchema(sources);

-                log.debug("Schema successfully created.");

-                setSLSchema(schema);

-            } catch (SAXException e) {

-                log.error("Failed to load security layer schema.", e);

-                throw new SLRuntimeException("Failed to load security layer schema.", e);

-            } catch (IOException e) {

-                log.error("Failed to load security layer schema.", e);

-                throw new SLRuntimeException("Failed to load security layer schema.", e);

-            }

-

-        }

-    }

-

-    /**

-     * Get an instance of the <code>SLCommandFactory</code>.

-     */

-    public synchronized static SLCommandFactory getInstance() {

-        if (instance == null) {

-          instance = new SLCommandFactory();

-          instance.ensureJaxbContext();

-          instance.ensureSchema();

-        }

-        return instance;

-    }

-

-    /**

-     * Private constructor used by {@link #getInstance()}.

-     */

-    private SLCommandFactory() {

-    }

-

-    /**

-     * Unmarshalls from the given <code>source</code>.

-     * 

-     * @see Unmarshaller#unmarshal(Source)

-     * 

-     * <em>Note:</em>Could replace JAXB's unmarshal-time validation engine (see commented code), however,

-     * we need a redirect filter.

-     * 

-     * @param source

-     *          the source to unmarshal from

-     * @return the object returned by {@link Unmarshaller#unmarshal(Source)}

-     * @throws SLRequestException

-     *           if unmarshalling fails

-     * @throws SLRuntimeException

-     *           if an unexpected error occurs configuring the unmarshaller or if

-     *           unmarshalling fails with an unexpected error

-     */

-    protected Object unmarshal(Source source) throws SLRuntimeException,

-      SLRequestException {

-

-        Object object;

-        try {

-            

-//            ValidatorHandler validator = slSchema.newValidatorHandler();

-//            validator.getContentHandler();

-//            

-//            SAXParserFactory spf = SAXParserFactory.newInstance();

-//            spf.setNamespaceAware(true);

-//            XMLReader saxReader = spf.newSAXParser().getXMLReader();

-//            //TODO extend validator to implement redirectContentHandler (validate+redirect)

-//            saxReader.setContentHandler(validator);

-//            //TODO get a InputSource

-//            SAXSource saxSource = new SAXSource(saxReader, source);

-//            

-//            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();

-//            //turn off duplicate jaxb validation 

-//            unmarshaller.setSchema(null);

-//            unmarshaller.setListener(listener);

-//            unmarshaller.unmarshal(saxSource);

-            

-

-            XMLInputFactory inputFactory = XMLInputFactory.newInstance();

-            XMLEventReader eventReader = inputFactory.createXMLEventReader(source);

-            RedirectEventFilter redirectEventFilter = new RedirectEventFilter();

-            XMLEventReader filteredReader = inputFactory.createFilteredReader(eventReader, redirectEventFilter);

-

-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();

-            unmarshaller.setListener(new RedirectUnmarshallerListener(redirectEventFilter));

-            if (slSchema != null) {

-                unmarshaller.setSchema(slSchema);

-            }

-            log.trace("Before unmarshal().");

-            object = unmarshaller.unmarshal(filteredReader);

-            log.trace("After unmarshal().");

-        } catch (UnmarshalException e) {

-            if (log.isDebugEnabled()) {

-                log.debug("Failed to unmarshall security layer request.", e);

-            } else {

-                log.info("Failed to unmarshall security layer request." + e.getMessage());

-            }

-            Throwable cause = e.getCause();

-            if (cause instanceof SAXParseException) {

-                throw new SLRequestException(3000,

-                  SLExceptionMessages.EC3000_UNCLASSIFIED, new Object[]{cause.getMessage()});

-            } else {

-                throw new SLRequestException(3000,

-                  SLExceptionMessages.EC3000_UNCLASSIFIED, new Object[]{e});

-            }

-        } catch (JAXBException e) {

-            // unexpected error

-            log.error("Failed to unmarshall security layer request.", e);

-            throw new SLRuntimeException(e);

-        } catch (XMLStreamException e) {

-            // unexpected error

-            log.error("Failed to unmarshall security layer request.", e);

-            throw new SLRuntimeException(e);

-        }

-

-        return object;

-

-    }

-

-    /**

-     * Creates a new <code>SLCommand</code> from the given <code>source</code> and

-     * <code>context</code>.

-     * 

-     * @param source

-     *          the <code>Source</code> to unmarshall from

-     * @param context

-     *          the context for the created <code>SLCommand</code>

-     * @return the <code>SLCommand</code> unmarshalled from the given

-     *         <code>source</code>

-     * @throws SLRequestException 

-     *           if unmarshalling fails

-     * @throws SLCommandException

-     *           if command ist not supported

-     * @throws SLRuntimeException

-     *           if an unexpected error occurs configuring the unmarshaller, if

-     *           unmarshalling fails with an unexpected error or if the

-     *           corresponding <code>SLCommand</code> could not be instantiated

-     */

-    @SuppressWarnings("unchecked")

-    public SLCommand createSLCommand(Source source, SLCommandContext context)

+                setJaxbContext(JAXBContext.newInstance(slPkg + ":" + xmldsigPkg + ":" + cardChannelPkg));
+            } catch (JAXBException e) {
+                log.error("Failed to setup JAXBContext security layer request.", e);
+                throw new SLRuntimeException(e);
+            }
+        }
+    }
+
+    /**
+     * Initialize the security layer schema.
+     */
+    private synchronized void ensureSchema() {
+        if (slSchema == null) {
+            try {
+                SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+                ClassLoader cl = SLCommandFactory.class.getClassLoader();
+                Source[] sources = new Source[SCHEMA_FILES.length];
+                for (int i = 0; i < SCHEMA_FILES.length; i++) {
+                    String schemaFile = SCHEMA_FILES[i];
+                    URL schemaURL = cl.getResource(schemaFile);
+                    if (schemaURL == null) {
+                        throw new SLRuntimeException("Failed to load schema file " + schemaFile + ".");
+                    }
+                    log.debug("Schema location: " + schemaURL);
+                    sources[i] = new StreamSource(schemaURL.openStream());
+                }
+                Schema schema = schemaFactory.newSchema(sources);
+                log.debug("Schema successfully created.");
+                setSLSchema(schema);
+            } catch (SAXException e) {
+                log.error("Failed to load security layer schema.", e);
+                throw new SLRuntimeException("Failed to load security layer schema.", e);
+            } catch (IOException e) {
+                log.error("Failed to load security layer schema.", e);
+                throw new SLRuntimeException("Failed to load security layer schema.", e);
+            }
+
+        }
+    }
+
+    /**
+     * Get an instance of the <code>SLCommandFactory</code>.
+     */
+    public synchronized static SLCommandFactory getInstance() {
+        if (instance == null) {
+          instance = new SLCommandFactory();
+          instance.ensureJaxbContext();
+          instance.ensureSchema();
+        }
+        return instance;
+    }
+
+    /**
+     * Private constructor used by {@link #getInstance()}.
+     */
+    private SLCommandFactory() {
+    }
+
+    /**
+     * Unmarshalls from the given <code>source</code>.
+     * 
+     * @see Unmarshaller#unmarshal(Source)
+     * 
+     * <em>Note:</em>Could replace JAXB's unmarshal-time validation engine (see commented code), however,
+     * we need a redirect filter.
+     * 
+     * @param source
+     *          the source to unmarshal from
+     * @return the object returned by {@link Unmarshaller#unmarshal(Source)}
+     * @throws SLRequestException
+     *           if unmarshalling fails
+     * @throws SLRuntimeException
+     *           if an unexpected error occurs configuring the unmarshaller or if
+     *           unmarshalling fails with an unexpected error
+     */
+    protected Object unmarshal(Source source) throws SLRuntimeException,
+      SLRequestException {
+
+        Object object;
+        try {
+            
+//            ValidatorHandler validator = slSchema.newValidatorHandler();
+//            validator.getContentHandler();
+//            
+//            SAXParserFactory spf = SAXParserFactory.newInstance();
+//            spf.setNamespaceAware(true);
+//            XMLReader saxReader = spf.newSAXParser().getXMLReader();
+//            //TODO extend validator to implement redirectContentHandler (validate+redirect)
+//            saxReader.setContentHandler(validator);
+//            //TODO get a InputSource
+//            SAXSource saxSource = new SAXSource(saxReader, source);
+//            
+//            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+//            //turn off duplicate jaxb validation 
+//            unmarshaller.setSchema(null);
+//            unmarshaller.setListener(listener);
+//            unmarshaller.unmarshal(saxSource);
+            
+
+            XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+            XMLEventReader eventReader = inputFactory.createXMLEventReader(source);
+            RedirectEventFilter redirectEventFilter = new RedirectEventFilter();
+            XMLEventReader filteredReader = inputFactory.createFilteredReader(eventReader, redirectEventFilter);
+
+            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+            unmarshaller.setListener(new RedirectUnmarshallerListener(redirectEventFilter));
+            if (slSchema != null) {
+                unmarshaller.setSchema(slSchema);
+            }
+            log.trace("Before unmarshal().");
+            object = unmarshaller.unmarshal(filteredReader);
+            log.trace("After unmarshal().");
+        } catch (UnmarshalException e) {
+            if (log.isDebugEnabled()) {
+                log.debug("Failed to unmarshall security layer request.", e);
+            } else {
+                log.info("Failed to unmarshall security layer request." + e.getMessage());
+            }
+            Throwable cause = e.getCause();
+            if (cause instanceof SAXParseException) {
+                throw new SLRequestException(3000,
+                  SLExceptionMessages.EC3000_UNCLASSIFIED, new Object[]{cause.getMessage()});
+            } else {
+                throw new SLRequestException(3000,
+                  SLExceptionMessages.EC3000_UNCLASSIFIED, new Object[]{e});
+            }
+        } catch (JAXBException e) {
+            // unexpected error
+            log.error("Failed to unmarshall security layer request.", e);
+            throw new SLRuntimeException(e);
+        } catch (XMLStreamException e) {
+            // unexpected error
+            log.error("Failed to unmarshall security layer request.", e);
+            throw new SLRuntimeException(e);
+        }
+
+        return object;
+
+    }
+
+    /**
+     * Creates a new <code>SLCommand</code> from the given <code>source</code> and
+     * <code>context</code>.
+     * 
+     * @param source
+     *          the <code>Source</code> to unmarshall from
+     * @param context
+     *          the context for the created <code>SLCommand</code>
+     * @return the <code>SLCommand</code> unmarshalled from the given
+     *         <code>source</code>
+     * @throws SLRequestException 
+     *           if unmarshalling fails
+     * @throws SLCommandException
+     *           if command ist not supported
+     * @throws SLRuntimeException
+     *           if an unexpected error occurs configuring the unmarshaller, if
+     *           unmarshalling fails with an unexpected error or if the
+     *           corresponding <code>SLCommand</code> could not be instantiated
+     */
+    @SuppressWarnings("unchecked")
+    public SLCommand createSLCommand(Source source, SLCommandContext context)
       throws SLCommandException, SLRuntimeException, SLRequestException {
       
         DebugReader dr = null;
@@ -338,8 +336,8 @@ public class SLCommandFactory {
             dr = new DebugReader(streamSource.getReader(), "SLCommand unmarshalled from:\n");
             streamSource.setReader(dr);
           }
-        }

-

+        }
+
         Object object;
         try {
           object = unmarshal(source);
@@ -351,44 +349,44 @@ public class SLCommandFactory {
           }
         }
         
-        if (!(object instanceof JAXBElement)) {

-            // invalid request

+        if (!(object instanceof JAXBElement)) {
+            // invalid request
             log.info("Invalid security layer request. " + object.toString());
-            throw new SLRequestException(3002, SLExceptionMessages.EC3002_INVALID,

-              new Object[]{object.toString()});

-        }

-

-        QName qName = ((JAXBElement) object).getName();

-        Class<? extends SLCommand> implClass = getImplClass(qName);

-        if (implClass == null) {

-            // command not supported

-            log.info("Unsupported command received: " + qName.toString());

-            throw new SLCommandException(4011,

-              SLExceptionMessages.EC4011_NOTIMPLEMENTED, new Object[]{qName.toString()});

-        }

+            throw new SLRequestException(3002, SLExceptionMessages.EC3002_INVALID,
+              new Object[]{object.toString()});
+        }
 
+        QName qName = ((JAXBElement) object).getName();
+        Class<? extends SLCommand> implClass = getImplClass(qName);
+        if (implClass == null) {
+            // command not supported
+            log.info("Unsupported command received: " + qName.toString());
+            throw new SLCommandException(4011,
+              SLExceptionMessages.EC4011_NOTIMPLEMENTED, new Object[]{qName.toString()});
+        }
+
+        
         
-        

-        // try to instantiate

-        SLCommand slCommand;

-        try {

-            slCommand = implClass.newInstance();

-            log.debug("SLCommand " + slCommand.getName() + " created.");

-        } catch (InstantiationException e) {

-            // unexpected error

-            log.error("Failed to instantiate security layer command implementation.",

-              e);

-            throw new SLRuntimeException(e);

-        } catch (IllegalAccessException e) {

-            // unexpected error

-            log.error("Failed to instantiate security layer command implementation.",

-              e);

-            throw new SLRuntimeException(e);

-        }

+        // try to instantiate
+        SLCommand slCommand;
+        try {
+            slCommand = implClass.newInstance();
+            log.debug("SLCommand " + slCommand.getName() + " created.");
+        } catch (InstantiationException e) {
+            // unexpected error
+            log.error("Failed to instantiate security layer command implementation.",
+              e);
+            throw new SLRuntimeException(e);
+        } catch (IllegalAccessException e) {
+            // unexpected error
+            log.error("Failed to instantiate security layer command implementation.",
+              e);
+            throw new SLRuntimeException(e);
+        }
+
+        slCommand.init(context, (JAXBElement) object);
+
+        return slCommand;
 
-        slCommand.init(context, (JAXBElement) object);

-

-        return slCommand;

-

-    }

+    }
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java
index 4b1cc779..19b84ac7 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CardChannelInfoboxImpl.java
@@ -118,7 +118,7 @@ public class CardChannelInfoboxImpl extends AbstractBinaryFileInfobox {
 
       ByteArrayOutputStream redirectedStream = ((at.gv.egiz.slbinding.impl.XMLContentType) content).getRedirectedStream();
       if (redirectedStream != null) {
-        
+
         if (log.isDebugEnabled()) {
 
           StringBuilder sb = new StringBuilder();
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
new file mode 100644
index 00000000..46bfe18b
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package at.gv.egiz.bku.slcommands.impl;
+
+import at.buergerkarte.namespaces.securitylayer._1.GetStatusRequestType;
+import at.gv.egiz.bku.slcommands.GetStatusCommand;
+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.SLException;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.STAL;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.StatusRequest;
+import at.gv.egiz.stal.StatusResponse;
+import java.util.Collections;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class GetStatusCommandImpl extends SLCommandImpl<GetStatusRequestType> implements GetStatusCommand {
+
+  protected static Log log = LogFactory.getLog(GetStatusCommandImpl.class);
+
+  @Override
+  public String getName() {
+    return "GetStatusRequest";
+  }
+
+  @Override
+  public SLResult execute() {
+
+    //ignore maxDelay and TokenStatus
+//    GetStatusRequestType req = getRequestValue();
+
+    log.debug("execute GetStatusRequest");
+
+    StatusRequest stalRequest = new StatusRequest();
+
+    STAL stal = cmdCtx.getSTAL();
+
+    List<STALResponse> responses = stal.handleRequest(Collections.singletonList(stalRequest));
+    
+    if (responses != null && responses.size() == 1) {
+      STALResponse stalResponse = responses.get(0);
+      if (stalResponse instanceof StatusResponse) {
+        boolean ready = ((StatusResponse) stalResponse).isCardReady();
+        log.trace("received status response cardReady: " + ready);
+        return new GetStatusResultImpl(ready);
+      } else if (stalResponse instanceof ErrorResponse) {
+        log.debug("received error response");
+        SLCommandException ex = new SLCommandException(((ErrorResponse) stalResponse).getErrorCode());
+        return new ErrorResultImpl(ex, cmdCtx.getLocale());
+      }
+    }
+    log.error("received unexpected responses");
+    return new ErrorResultImpl(new SLCommandException(4000), cmdCtx.getLocale());
+
+  }
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java
new file mode 100644
index 00000000..fddd3b0b
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package at.gv.egiz.bku.slcommands.impl;
+
+import at.buergerkarte.namespaces.securitylayer._1.GetStatusResponseType;
+import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
+import at.buergerkarte.namespaces.securitylayer._1.TokenStatusType;
+import at.gv.egiz.bku.slcommands.GetStatusResult;
+import javax.xml.bind.JAXBElement;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class GetStatusResultImpl extends SLResultImpl implements GetStatusResult {
+
+  protected ObjectFactory of;
+  protected GetStatusResponseType responseType;
+
+  public GetStatusResultImpl(boolean ready) {
+    of = new ObjectFactory();
+    responseType = of.createGetStatusResponseType();
+    if (ready) {
+      responseType.setTokenStatus(TokenStatusType.READY);
+    } else {
+      responseType.setTokenStatus(TokenStatusType.REMOVED);
+    }
+
+  }
+
+  @Override
+  public void writeTo(Result result, Templates templates) {
+    JAXBElement<GetStatusResponseType> response = of.createGetStatusResponse(responseType);
+    writeTo(response, result, templates);
+  }
+}