From e04cf9f1d1e0218f3d49b5a88e8ef8c00eed08b2 Mon Sep 17 00:00:00 2001 From: "szegedia%freemail.hu" Date: Wed, 6 Sep 2006 12:54:45 +0000 Subject: [PATCH] Introduced SecurityUtilities -- for now, allows getting system properties in a privileged block git-svn-id: svn://10.0.0.236/trunk@209263 18797224-902f-48f8-a5cc-f745e15eee43 --- .../org/mozilla/javascript/Interpreter.java | 2 +- .../mozilla/javascript/SecurityUtilities.java | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 mozilla/js/rhino/src/org/mozilla/javascript/SecurityUtilities.java diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java b/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java index 69971ff3761..b9e313e5127 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java @@ -2155,7 +2155,7 @@ public class Interpreter { String tag = "org.mozilla.javascript.Interpreter.interpretLoop"; StringBuffer sb = new StringBuffer(nativeStackTrace.length() + 1000); - String lineSeparator = System.getProperty("line.separator"); + String lineSeparator = SecurityUtilities.getSystemProperty("line.separator"); CallFrame[] array = (CallFrame[])ex.interpreterStackInfo; int[] linePC = ex.interpreterLineData; diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/SecurityUtilities.java b/mozilla/js/rhino/src/org/mozilla/javascript/SecurityUtilities.java new file mode 100644 index 00000000000..659578a7416 --- /dev/null +++ b/mozilla/js/rhino/src/org/mozilla/javascript/SecurityUtilities.java @@ -0,0 +1,65 @@ +/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (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.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is Rhino code, released + * May 6, 1999. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1997-1999 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * Norris Boyd + * Igor Bukanov + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU Public License (the "GPL"), in which case the + * provisions of the GPL are applicable instead of those above. + * If you wish to allow use of your version of this file only + * under the terms of the GPL and not to allow others to use your + * version of this file under the NPL, indicate your decision by + * deleting the provisions above and replace them with the notice + * and other provisions required by the GPL. If you do not delete + * the provisions above, a recipient may use your version of this + * file under either the NPL or the GPL. + */ + +package org.mozilla.javascript; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * @author Attila Szegedi + * @version $Id: SecurityUtilities.java,v 1.1 2006-09-06 12:53:49 szegedia%freemail.hu Exp $ + */ +public class SecurityUtilities +{ + /** + * Retrieves a system property within a privileged block. Use it only when + * the property is used from within Rhino code and is not passed out of it. + * @param name the name of the system property + * @return the value of the system property + */ + public static String getSystemProperty(final String name) + { + return (String)AccessController.doPrivileged( + new PrivilegedAction() + { + public Object run() + { + return System.getProperty(name); + } + }); + } +}