karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch master updated: [KARAF-6230] Prevent use of relative path in config:install and ConfigMBean#install()
Date Thu, 11 Apr 2019 15:55:04 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new fe3bc41  [KARAF-6230] Prevent use of relative path in config:install and ConfigMBean#install()
     new 4155eac  Merge pull request #805 from jbonofre/KARAF-6230
fe3bc41 is described below

commit fe3bc4108e5a8b3c804e5da91ec0d5695588eb25
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Mon Apr 8 18:05:22 2019 +0200

    [KARAF-6230] Prevent use of relative path in config:install and ConfigMBean#install()
---
 .../karaf/config/command/InstallCommand.java       |  3 ++
 .../karaf/config/core/impl/ConfigMBeanImpl.java    |  3 ++
 .../config/core/impl/ConfigMBeanImplTest.java      | 55 ++++++++++++++++++++++
 config/src/test/resources/test.cfg                 | 17 +++++++
 4 files changed, 78 insertions(+)

diff --git a/config/src/main/java/org/apache/karaf/config/command/InstallCommand.java b/config/src/main/java/org/apache/karaf/config/command/InstallCommand.java
index 9e56cb1..ea55226 100644
--- a/config/src/main/java/org/apache/karaf/config/command/InstallCommand.java
+++ b/config/src/main/java/org/apache/karaf/config/command/InstallCommand.java
@@ -45,6 +45,9 @@ public class InstallCommand implements Action {
 
     @Override
     public Object execute() throws Exception {
+        if (finalname.contains("..")) {
+            throw new IllegalArgumentException("For security reason, relative path is not
allowed in config file final name");
+        }
         File etcFolder = new File(System.getProperty("karaf.etc"));
         File file = new File(etcFolder, finalname);
         if (file.exists()) {
diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
index de142c8..cdd2f3c 100644
--- a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
+++ b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
@@ -84,6 +84,9 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean
{
 
     @Override
     public void install(String url, String finalname, boolean override) throws MBeanException
{
+        if (finalname.contains("..")) {
+            throw new IllegalArgumentException("For security reason, relative path is not
allowed in config file final name");
+        }
         try {
             File etcFolder = new File(System.getProperty("karaf.etc"));
             File file = new File(etcFolder, finalname);
diff --git a/config/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java
b/config/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java
new file mode 100644
index 0000000..4bdf08a
--- /dev/null
+++ b/config/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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 org.apache.karaf.config.core.impl;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+public class ConfigMBeanImplTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInstallWithNonAuthorizePath() throws Exception {
+        System.setProperty("karaf.etc", ".");
+
+        ConfigMBeanImpl configMBean = new ConfigMBeanImpl();
+
+        configMBean.install("file:foo.cfg", "../test.cfg", false);
+    }
+
+    @Test
+    public void testInstall() throws Exception {
+        System.setProperty("karaf.etc", "./target/test-classes");
+
+        ConfigMBeanImpl configMBean = new ConfigMBeanImpl();
+
+        configMBean.install("file:./target/test-classes/test.cfg", "foo.cfg", true);
+
+        File output = new File("target/test-classes/foo.cfg");
+
+        Assert.assertTrue(output.exists());
+
+        StringBuilder builder = new StringBuilder();
+        BufferedReader reader = new BufferedReader(new FileReader(output));
+        String line = null;
+        while ((line = reader.readLine()) != null) {
+            builder.append(line).append("\n");
+        }
+        Assert.assertTrue(builder.toString().contains("foo=bar"));
+    }
+
+}
diff --git a/config/src/test/resources/test.cfg b/config/src/test/resources/test.cfg
new file mode 100644
index 0000000..80325b1
--- /dev/null
+++ b/config/src/test/resources/test.cfg
@@ -0,0 +1,17 @@
+#
+#    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.
+#
+foo=bar


Mime
View raw message