You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/17 17:27:27 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/util SecureFileHandlerTest.java FileHandlerTest.java
jvanzyl 01/06/17 08:27:27
Modified: src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpcService.java
src/java/org/apache/turbine/services/xmlrpc/util
FileHandlerTest.java
Added: src/java/org/apache/turbine/services/xmlrpc/util
SecureFileHandlerTest.java
Log:
- adding capability to the xmlrpc service to run a secure webserver,
and added a test for secure file transfers.
Revision Changes Path
1.26 +33 -5 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TurbineXmlRpcService.java 2001/06/14 14:46:20 1.25
+++ TurbineXmlRpcService.java 2001/06/17 15:27:26 1.26
@@ -59,6 +59,8 @@
import helma.xmlrpc.XmlRpcClient;
import helma.xmlrpc.XmlRpcException;
import helma.xmlrpc.XmlRpcServer;
+import helma.xmlrpc.secure.SecureWebServer;
+import helma.xmlrpc.secure.SecurityTool;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
@@ -73,6 +75,8 @@
import org.apache.turbine.services.xmlrpc.util.FileTransfer;
import org.apache.turbine.util.TurbineException;
+import org.apache.velocity.runtime.configuration.Configuration;
+
/**
* This is a service which will make an xml-rpc call to a remote
* server.
@@ -93,7 +97,7 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineXmlRpcService.java,v 1.25 2001/06/14 14:46:20 jvanzyl Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.26 2001/06/17 15:27:26 jvanzyl Exp $
*/
public class TurbineXmlRpcService
extends BaseService
@@ -105,9 +109,6 @@
/** The encapsulated xmlrpc server. */
private XmlRpcServer server = null;
- /** The xmlrpc client. */
- private XmlRpcClient client = null;
-
/** The port to listen on. */
private int port = 0;
@@ -126,7 +127,34 @@
if(port != 0)
{
- webserver = new WebServer(port);
+ if (getConfiguration().getBoolean("secure", false))
+ {
+ // Get the values for the JSSE system properties
+ // that we must set for use in the SecureWebServer
+ // and the URL https connection handler that is
+ // used in XmlRpcClient.
+
+ Configuration secureServerOptions =
+ getConfiguration().subset("secure.server.option");
+
+ Iterator i = secureServerOptions.getKeys();
+
+ while (i.hasNext())
+ {
+ String option = (String) i.next();
+ String value = secureServerOptions.getString(option);
+
+ getCategory().debug("JSSE option: " + option + " => " + value);
+
+ System.setProperty(option, value);
+ }
+
+ webserver = new SecureWebServer(port);
+ }
+ else
+ {
+ webserver = new WebServer(port);
+ }
}
// Set the XML driver to the correct SAX parser class
1.9 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/util/FileHandlerTest.java
Index: FileHandlerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/util/FileHandlerTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileHandlerTest.java 2001/03/11 13:28:31 1.8
+++ FileHandlerTest.java 2001/06/17 15:27:27 1.9
@@ -67,8 +67,8 @@
/**
* Test class for FileHandler.
*
- * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: FileHandlerTest.java,v 1.8 2001/03/11 13:28:31 ilkka Exp $
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ * @version $Id: FileHandlerTest.java,v 1.9 2001/06/17 15:27:27 jvanzyl Exp $
*/
public class FileHandlerTest extends BaseTestCase
{
1.1 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/util/SecureFileHandlerTest.java
Index: SecureFileHandlerTest.java
===================================================================
package org.apache.turbine.services.xmlrpc.util;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.util.Vector;
import java.net.URL;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.services.xmlrpc.TurbineXmlRpc;
/**
* Test class for FileHandler.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id: SecureFileHandlerTest.java,v 1.1 2001/06/17 15:27:27 jvanzyl Exp $
*/
public class SecureFileHandlerTest extends BaseTestCase
{
/**
* Creates a new instance.
*/
public SecureFileHandlerTest(String name)
{
super(name);
}
/**
* Creates a test suite for this class.
*
* @return A test suite for this class.
*/
public static Test suite()
{
return new TestSuite(SecureFileHandlerTest.class);
}
/**
* Test to make sure that the FileHandler is working
* correctly for files moving from the client to
* the server.
*/
public void testSend() throws Exception
{
FileTransfer.send("https://localhost:9000/RPC2",
"test.location",
"test.txt",
"test.location",
"test.send");
}
/**
* Test to make sure that the FileHandler is working
* correctly for files moving from the server to
* the client.
*/
public void testGet() throws Exception
{
FileTransfer.get("https://localhost:9000/RPC2",
"test.location",
"test.txt",
"test.location",
"test.get");
}
/**
* Test to make sure that the FileHandler is working
* correctly to remove files from the server.
*/
public void testRemove() throws Exception
{
FileTransfer.remove("https://localhost:9000/RPC2",
"test.location",
"test.txt");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org