karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmoulli...@apache.org
Subject svn commit: r1424420 - in /karaf/branches/karaf-2.3.x/jaas/jasypt/src/test: java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java resources/org/apache/karaf/jaas/jasypt/handler/config-adminTest.xml
Date Thu, 20 Dec 2012 11:48:22 GMT
Author: cmoulliard
Date: Thu Dec 20 11:48:22 2012
New Revision: 1424420

URL: http://svn.apache.org/viewvc?rev=1424420&view=rev
Log:
KARAF-2076: Add a pojosr unit test to validate that we can use OSGI Config Admin with value
encrypted (JAAS - Jasypt)

Added:
    karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
    karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/config-adminTest.xml

Added: karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java?rev=1424420&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
(added)
+++ karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/java/org/apache/karaf/jaas/jasypt/handler/EncryptableConfigAdminPropertyPlaceholderTest.java
Thu Dec 20 11:48:22 2012
@@ -0,0 +1,257 @@
+/*
+ *  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.
+ *  under the License.
+ */
+package org.apache.karaf.jaas.jasypt.handler;
+
+import de.kalpatec.pojosr.framework.PojoServiceRegistryFactoryImpl;
+import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
+import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
+import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
+import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
+import junit.framework.TestCase;
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
+import org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
+import org.osgi.framework.*;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+
+import java.io.*;
+import java.net.URL;
+import java.util.*;
+import java.util.jar.JarInputStream;
+
+import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
+
+public class EncryptableConfigAdminPropertyPlaceholderTest extends TestCase {
+
+    public static final long DEFAULT_TIMEOUT = 30000;
+
+    private BundleContext bundleContext;
+    private ConfigurationAdmin configAdmin;
+    private EnvironmentStringPBEConfig env;
+    private StandardPBEStringEncryptor enc;
+    private String encryptedValue;
+
+    @Before
+    public void setUp() throws Exception {
+
+        // Configure Jasypt
+        enc = new StandardPBEStringEncryptor();
+        env = new EnvironmentStringPBEConfig();
+        env.setAlgorithm("PBEWithMD5AndDES");
+        env.setPassword("password");
+        enc.setConfig(env);
+
+        System.setProperty("org.osgi.framework.storage", "target/osgi/" + System.currentTimeMillis());
+        System.setProperty("karaf.name", "root");
+
+        List<BundleDescriptor> bundles = new ClasspathScanner().scanForBundles("(Bundle-SymbolicName=*)");
+        bundles.add(getBundleDescriptor(
+                "target/jasypt.jar",
+                newBundle().add("OSGI-INF/blueprint/karaf-jaas-jasypt.xml", getClass().getResource("/OSGI-INF/blueprint/karaf-jaas-jasypt.xml"))
+                        .set("Manifest-Version", "2")
+                        .set("Bundle-ManifestVersion", "2")
+                        .set("Bundle-SymbolicName", "jasypt")
+                        .set("Bundle-Version", "0.0.0")));
+        bundles.add(getBundleDescriptor(
+                "target/test.jar",
+                newBundle().add("OSGI-INF/blueprint/config-adminTest.xml", getClass().getResource("config-adminTest.xml"))
+                        .set("Manifest-Version", "2")
+                        .set("Bundle-ManifestVersion", "2")
+                        .set("Bundle-SymbolicName", "configtest")
+                        .set("Bundle-Version", "0.0.0")));
+
+        Map config = new HashMap();
+        config.put(PojoServiceRegistryFactory.BUNDLE_DESCRIPTORS, bundles);
+        PojoServiceRegistry reg = new PojoServiceRegistryFactoryImpl().newPojoServiceRegistry(config);
+        bundleContext = reg.getBundleContext();
+    }
+
+    private BundleDescriptor getBundleDescriptor(String path, TinyBundle bundle) throws Exception
{
+        File file = new File(path);
+        FileOutputStream fos = new FileOutputStream(file);
+        copy(bundle.build(), fos);
+        fos.close();
+        JarInputStream jis = new JarInputStream(new FileInputStream(file));
+        Map<String, String> headers = new HashMap<String, String>();
+        for (Map.Entry entry : jis.getManifest().getMainAttributes().entrySet()) {
+            headers.put(entry.getKey().toString(), entry.getValue().toString());
+        }
+        return new BundleDescriptor(
+                getClass().getClassLoader(),
+                new URL("jar:" + file.toURI().toString() + "!/"),
+                headers);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        bundleContext.getBundle().stop();
+    }
+
+    @Test
+    public void testEncryptConfigProperty() throws Exception {
+
+        for (Bundle bundle : bundleContext.getBundles()) {
+            System.out.println(bundle.getSymbolicName() + " / " + bundle.getVersion());
+        }
+
+        configAdmin = getOsgiService(ConfigurationAdmin.class);
+        assertNotNull(configAdmin);
+
+        Configuration config = configAdmin.createFactoryConfiguration("encrypt.config");
+        Dictionary props = new Properties();
+
+        // Encrypt a key/value
+        // bar is encrypted and link to foo key
+        encryptedValue = enc.encrypt("bar");
+        props.put("foo", encryptedValue);
+        config.setBundleLocation(null);
+        config.update(props);
+
+        Configuration[] configs = configAdmin.listConfigurations(null);
+
+        for (Configuration conf : configs) {
+            String pid = conf.getPid();
+
+            // System.out.println(">> Config pid : " + pid);
+
+            Dictionary<String, ?> dict = conf.getProperties();
+            for (Enumeration e = dict.keys(); e.hasMoreElements(); ) {
+                String key = (String) e.nextElement();
+                Object value = dict.get(key);
+
+                // System.out.println(">> Key : " + key + ", value : " + value);
+
+                if (key.equals("foo")) {
+                    String val = (String) value;
+                    // Verify encrypted value
+                    assertEquals(encryptedValue, val);
+                    // Decrypt and check value
+                    String decrypt = enc.decrypt(val);
+                    assertEquals("bar",decrypt);
+                }
+            }
+
+        }
+
+    }
+
+
+    protected <T> T getOsgiService(Class<T> type, long timeout) {
+        return getOsgiService(type, null, timeout);
+    }
+
+    protected <T> T getOsgiService(Class<T> type) {
+        return getOsgiService(type, null, DEFAULT_TIMEOUT);
+    }
+
+    protected <T> T getOsgiService(Class<T> type, String filter) {
+        return getOsgiService(type, filter, DEFAULT_TIMEOUT);
+    }
+
+    protected <T> T getOsgiService(Class<T> type, String filter, long timeout)
{
+        ServiceTracker tracker = null;
+        try {
+            String flt;
+            if (filter != null) {
+                if (filter.startsWith("(")) {
+                    flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")"
+ filter + ")";
+                } else {
+                    flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")("
+ filter + "))";
+                }
+            } else {
+                flt = "(" + Constants.OBJECTCLASS + "=" + type.getName() + ")";
+            }
+            Filter osgiFilter = FrameworkUtil.createFilter(flt);
+            tracker = new ServiceTracker(bundleContext, osgiFilter, null);
+            tracker.open(true);
+            // Note that the tracker is not closed to keep the reference
+            // This is buggy, as the service reference may change i think
+            Object svc = type.cast(tracker.waitForService(timeout));
+            if (svc == null) {
+                Dictionary dic = bundleContext.getBundle().getHeaders();
+                System.err.println("Test bundle headers: " + explode(dic));
+
+                for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null,
null))) {
+                    System.err.println("ServiceReference: " + ref);
+                }
+
+                for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null,
flt))) {
+                    System.err.println("Filtered ServiceReference: " + ref);
+                }
+
+                throw new RuntimeException("Gave up waiting for service " + flt);
+            }
+            return type.cast(svc);
+        } catch (InvalidSyntaxException e) {
+            throw new IllegalArgumentException("Invalid filter", e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /*
+     * Explode the dictionary into a ,-delimited list of key=value pairs
+     */
+    private static String explode(Dictionary dictionary) {
+        Enumeration keys = dictionary.keys();
+        StringBuffer result = new StringBuffer();
+        while (keys.hasMoreElements()) {
+            Object key = keys.nextElement();
+            result.append(String.format("%s=%s", key, dictionary.get(key)));
+            if (keys.hasMoreElements()) {
+                result.append(", ");
+            }
+        }
+        return result.toString();
+    }
+
+    /*
+     * Provides an iterable collection of references, even if the original array is null
+     */
+    private static final Collection<ServiceReference> asCollection(ServiceReference[]
references) {
+        List<ServiceReference> result = new LinkedList<ServiceReference>();
+        if (references != null) {
+            for (ServiceReference reference : references) {
+                result.add(reference);
+            }
+        }
+        return result;
+    }
+
+    public static long copy(final InputStream input, final OutputStream output) throws IOException
{
+        return copy(input, output, 8024);
+    }
+
+    public static long copy(final InputStream input, final OutputStream output, int buffersize)
throws IOException {
+        final byte[] buffer = new byte[buffersize];
+        int n;
+        long count = 0;
+        while (-1 != (n = input.read(buffer))) {
+            output.write(buffer, 0, n);
+            count += n;
+        }
+        return count;
+    }
+
+    /*
+    public void setConfigAdmin(ConfigurationAdmin configAdmin) {
+        this.configAdmin = configAdmin;
+    }*/
+}

Added: karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/config-adminTest.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/config-adminTest.xml?rev=1424420&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/config-adminTest.xml
(added)
+++ karaf/branches/karaf-2.3.x/jaas/jasypt/src/test/resources/org/apache/karaf/jaas/jasypt/handler/config-adminTest.xml
Thu Dec 20 11:48:22 2012
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+        xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+        xmlns:enc="http://karaf.apache.org/xmlns/jasypt/v1.0.0"
+        xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
+
+    <cm:property-placeholder persistent-id="encrypt.config" update-strategy="reload" >
+        <cm:default-properties>
+            <cm:property name="encoded" value="ENC(${foo})"/>
+        </cm:default-properties>
+    </cm:property-placeholder>
+
+    <enc:property-placeholder>
+        <enc:encryptor class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
+            <property name="config">
+                <bean class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig">
+                    <property name="algorithm" value="PBEWithMD5AndDES" />
+                    <property name="password" value="password" />
+                </bean>
+            </property>
+        </enc:encryptor>
+    </enc:property-placeholder>
+
+</blueprint>
\ No newline at end of file



Mime
View raw message