This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 9a8f123 GROOVY-9175 migrate private methods to protected
9a8f123 is described below
commit 9a8f123bb3f4a230ff2fb5fa7faf7c552a7830d8
Author: aalmiray <[email protected]>
AuthorDate: Sat Jun 15 14:31:16 2019 +0200
GROOVY-9175 migrate private methods to protected
---
.../control/customizers/SecureASTCustomizer.java | 30 ++++++++++++----------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git
a/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
b/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
index 5a64348..6d7290d 100644
---
a/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
+++
b/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
@@ -611,7 +611,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
}
}
- final SecuringCodeVisitor visitor = new SecuringCodeVisitor();
+ final GroovyCodeVisitor visitor = createGroovyCodeVisitor();
ast.getStatementBlock().visit(visitor);
for (ClassNode clNode : ast.getClasses()) {
if (clNode!=classNode) {
@@ -631,14 +631,18 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
}
}
}
-
- private void checkMethodDefinitionAllowed(ClassNode owner) {
+
+ protected GroovyCodeVisitor createGroovyCodeVisitor() {
+ return new SecuringCodeVisitor();
+ }
+
+ protected void checkMethodDefinitionAllowed(ClassNode owner) {
if (isMethodDefinitionAllowed) return;
List<MethodNode> methods = filterMethods(owner);
if (!methods.isEmpty()) throw new SecurityException("Method
definitions are not allowed");
}
-
- private static List<MethodNode> filterMethods(ClassNode owner) {
+
+ protected static List<MethodNode> filterMethods(ClassNode owner) {
List<MethodNode> result = new LinkedList<MethodNode>();
List<MethodNode> methods = owner.getMethods();
for (MethodNode method : methods) {
@@ -650,7 +654,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
return result;
}
- private void assertStarImportIsAllowed(final String packageName) {
+ protected void assertStarImportIsAllowed(final String packageName) {
if (starImportsWhitelist != null &&
!starImportsWhitelist.contains(packageName)) {
throw new SecurityException("Importing [" + packageName + "] is
not allowed");
}
@@ -659,7 +663,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
}
}
- private void assertImportIsAllowed(final String className) {
+ protected void assertImportIsAllowed(final String className) {
if (importsWhitelist != null && !importsWhitelist.contains(className))
{
if (starImportsWhitelist != null) {
// we should now check if the import is in the star imports
@@ -685,7 +689,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
}
}
- private void assertStaticImportIsAllowed(final String member, final String
className) {
+ protected void assertStaticImportIsAllowed(final String member, final
String className) {
final String fqn = member.equals(className) ? member : className + "."
+ member;
if (staticImportsWhitelist != null &&
!staticImportsWhitelist.contains(fqn)) {
if (staticStarImportsWhitelist != null) {
@@ -713,7 +717,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
* CodeVisitorSupport} class to make sure that future features of the
language gets managed by this visitor. Thus,
* adding a new feature would result in a compilation error if this
visitor is not updated.
*/
- private class SecuringCodeVisitor implements GroovyCodeVisitor {
+ protected class SecuringCodeVisitor implements GroovyCodeVisitor {
/**
* Checks that a given statement is either in the whitelist or not in
the blacklist.
@@ -721,7 +725,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
* @param statement the statement to be checked
* @throws SecurityException if usage of this statement class is
forbidden
*/
- private void assertStatementAuthorized(final Statement statement)
throws SecurityException {
+ protected void assertStatementAuthorized(final Statement statement)
throws SecurityException {
final Class<? extends Statement> clazz = statement.getClass();
if (statementsBlacklist != null &&
statementsBlacklist.contains(clazz)) {
throw new SecurityException(clazz.getSimpleName() + "s are not
allowed");
@@ -741,7 +745,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
* @param expression the expression to be checked
* @throws SecurityException if usage of this expression class is
forbidden
*/
- private void assertExpressionAuthorized(final Expression expression)
throws SecurityException {
+ protected void assertExpressionAuthorized(final Expression expression)
throws SecurityException {
final Class<? extends Expression> clazz = expression.getClass();
if (expressionsBlacklist != null &&
expressionsBlacklist.contains(clazz)) {
throw new SecurityException(clazz.getSimpleName() + "s are not
allowed: " + expression.getText());
@@ -780,7 +784,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
}
}
- private ClassNode getExpressionType(ClassNode objectExpressionType) {
+ protected ClassNode getExpressionType(ClassNode objectExpressionType) {
return objectExpressionType.isArray() ?
getExpressionType(objectExpressionType.getComponentType()) :
objectExpressionType;
}
@@ -790,7 +794,7 @@ public class SecureASTCustomizer extends
CompilationCustomizer {
* @param token the token to be checked
* @throws SecurityException if usage of this token is forbidden
*/
- private void assertTokenAuthorized(final Token token) throws
SecurityException {
+ protected void assertTokenAuthorized(final Token token) throws
SecurityException {
final int value = token.getType();
if (tokensBlacklist != null && tokensBlacklist.contains(value)) {
throw new SecurityException("Token " + token + " is not
allowed");
