Skip to content
Permalink
Browse files
GROOVY-10610: Provide a better fallback for running without a securit…
…y manager for groovysh on JDK18
  • Loading branch information
paulk-asert committed May 1, 2022
1 parent 5c92180 commit 229add8af04da349d4d7b74fb89052a48f495e1b
Showing 2 changed files with 48 additions and 5 deletions.
@@ -26,7 +26,7 @@ import jline.TerminalFactory
import jline.UnixTerminal
import jline.UnsupportedTerminal
import jline.WindowsTerminal
import org.apache.groovy.groovysh.util.NoExitSecurityManager
import org.apache.groovy.groovysh.util.SecurityManagerUtil
import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.util.Logger
@@ -186,15 +186,13 @@ class Main {
}
}


SecurityManager psm = System.getSecurityManager()
System.setSecurityManager(new NoExitSecurityManager())
SecurityManagerUtil sm = new SecurityManagerUtil()

try {
code = shell.run(evalString, filenames)
}
finally {
System.setSecurityManager(psm)
sm.close()
}

// Force the JVM to exit at this point, since shell could have created threads or
@@ -0,0 +1,45 @@
/*
* 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.
*/
package org.apache.groovy.groovysh.util

import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.vmplugin.VMPlugin

class SecurityManagerUtil {
private final SecurityManager saved

SecurityManagerUtil() {
if (explicitlyEnabled() || autoEnabledUntilJDK17()) {
saved = System.getSecurityManager()
System.setSecurityManager(new NoExitSecurityManager())
}
}

private boolean autoEnabledUntilJDK17() {
!CompilerConfiguration.isPostJDK18(VMPlugin.javaVersion)
}

private boolean explicitlyEnabled() {
System.getProperty('java.security.manager', 'disallow') == 'allow'
}

void close() {
System.setSecurityManager(saved)
}
}

0 comments on commit 229add8

Please sign in to comment.