-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I'd like to make a small contribution to Jetspeed.
The attached patch enables the WebPagePortlet to display pages which require HTTP Basic Authentication. Please review the proposed patch, apply, and test it. Also, please post any comments or propose enhancements that might make it worthy of acceptance. Thanks, DP ============================================================ Changed Class: ============================================================ org.apache.jetspeed.portal.portlets.WebPagePortlet WebPagePortlet now recognized two new <portlet-entry> parameters - - username - - password The username and password are used to construct an HTTP Basic Authentication header which is used by the WebPagePortlet to access "secured" content. ============================================================ New Class: ============================================================ org.apache.jetspeed.util.Base64 Excerpt from RFC 2617 (http://www.faqs.org/rfcs/rfc2617.html) To receive authorization, the client sends the userid and password, separated by a single colon (":") character, within a base64 encoded string in the credentials. - -- David G. Powers PowerSource -----BEGIN PGP SIGNATURE----- Comment: Verify the authenticity of this message with the public key available at http://pssp.com/dgp_pk.asc iD8DBQE8ooi1jmjAPDT0/nERAvXxAJ9cthkMTQHNBgVrbOD83KehyngDSgCgqQck jhxsk10yKMySqNFAjQ08WBU= =bzP4 -----END PGP SIGNATURE-----
Index: src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java,v retrieving revision 1.8 diff -u -r1.8 WebPagePortlet.java --- src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java 5 Feb 2002 05:27:26 -0000 1.8 +++ src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java 28 Mar 2002 02:49:14 -0000 @@ -62,6 +62,7 @@ import org.apache.jetspeed.portal.PortletConfig; import org.apache.jetspeed.portal.PortletException; import org.apache.jetspeed.util.HTMLRewriter; +import org.apache.jetspeed.util.Base64; //turbine import org.apache.turbine.util.Log; @@ -81,6 +82,7 @@ *@author <a href="mailto:[EMAIL PROTECTED]";>Ingo Rammer</a> *@author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a> *@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a> + *@author <a href="mailto:[EMAIL PROTECTED]";>David G. Powers</a> */ public class WebPagePortlet extends AbstractPortlet { @@ -88,6 +90,8 @@ boolean initDone = false; boolean contentStale = true; boolean cacheContent = false; + String username = null; + String password = null; /** * Initialize this portlet by defining a HTML rewriter. @@ -123,6 +127,11 @@ config.getInitParameter("open_in_popup","no") .equalsIgnoreCase("yes") ); + + // fetch username and password for HTTP Basic Autentication + username = config.getInitParameter("username"); + password = config.getInitParameter("password"); + contentStale = true; initDone = true; } catch (Exception e) { @@ -141,7 +150,24 @@ private Reader getReader(String url) throws IOException { URL pageUrl = new URL(url); + URLConnection pageConn = pageUrl.openConnection(); + try + { + // set HTTP Basic Authetication header if username and password are set + if (username != null && password !=null) + { + pageConn.setRequestProperty("Authorization", "Basic " + + Base64.encodeAsString(username + ":" + password)); + } + + } + catch (Exception e) + { + Log.info("Exception occurred:" + e.toString()); + e.printStackTrace(); + } + long pageExpiration = pageConn.getExpiration(); String encoding = pageConn.getContentEncoding(); String tempString = null;
/* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-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 Jetspeed" must not be used to endorse or promote products * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" or * "Apache Jetspeed", 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/>. */ package org.apache.jetspeed.util; import javax.mail.internet.MimeUtility; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStreamReader; /** * Simple Base64 string decoding function * @author Jason Borden <[EMAIL PROTECTED]> * * This class was copied from the jakarta-james project. * The only change made, besides comments, is the package name. * This class orgininated in org.apache.james.util as version 1.3 * which was committed by darrel on 2002/01/18 02:48:39 * * $Id$ * Committed on $Date$ by: $Name$ */ public class Base64 { public static BufferedReader decode(String b64string) throws Exception { return new BufferedReader( new InputStreamReader( MimeUtility.decode( new ByteArrayInputStream( b64string.getBytes()), "base64"))); } public static String decodeAsString(String b64string) throws Exception { return decode(b64string).readLine().trim(); } public static ByteArrayOutputStream encode(String plaintext) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); byte[] in = plaintext.getBytes(); ByteArrayOutputStream inStream = new ByteArrayOutputStream(); inStream.write(in, 0, in.length); // pad if ((in.length % 3 ) == 1){ inStream.write(0); inStream.write(0); } else if((in.length % 3 ) == 2){ inStream.write(0); } inStream.writeTo( MimeUtility.encode(out, "base64") ); return out; } public static String encodeAsString(String plaintext) throws Exception { return encode(plaintext).toString(); } }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
