Skip to content

Commit 6d7d072

Browse files
committed
Disabling setting of SecurityManager.
1 parent 08f304a commit 6d7d072

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

build.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
patches/remove-db.diff
6262
patches/nbjavac-not-required.diff
6363
patches/l10n-licence.diff
64+
patches/no-security-manager-allow.diff
6465
</string>
6566
<filterchain>
6667
<tokenfilter delimoutput=" ">
@@ -105,6 +106,8 @@
105106
<move file="${lsp.build.dir}/platform/lib/nbexec" tofile="${lsp.build.dir}/platform/lib/nbexec.sh" />
106107
<replace file="${lsp.build.dir}/bin/nbcode.sh" token="/platform*/lib/nbexec" value="/platform*/lib/nbexec.sh"/>
107108
<replace file="${lsp.build.dir}/bin/nbcode.sh" token="basename &quot;$PRG&quot;" value="basename &quot;$PRG&quot; &quot;.sh&quot;"/>
109+
<replace file="${lsp.build.dir}/platform/lib/nbexec.dll" token="java.security.manager" value="no.java.secur.manager" encoding="ISO-8859-1"/>
110+
<replace file="${lsp.build.dir}/platform/lib/nbexec64.dll" token="java.security.manager" value="no.java.secur.manager" encoding="ISO-8859-1"/>
108111
<chmod file="${lsp.build.dir}/bin/nbcode.sh" perm="u+x" />
109112
<chmod file="${lsp.build.dir}/platform/lib/nbexec.sh" perm="u+x"/>
110113
<chmod file="${lsp.build.dir}/java/maven/bin/mvn.sh" perm="u+x" />
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec
2+
index 1d6ad6e530..228b37cbe2 100755
3+
--- a/platform/o.n.bootstrap/launcher/unix/nbexec
4+
+++ b/platform/o.n.bootstrap/launcher/unix/nbexec
5+
@@ -192,7 +192,7 @@ fi
6+
# rename old heap dump to .old
7+
mv "${userdir}/var/log/heapdump.hprof" "${userdir}/var/log/heapdump.hprof.old" > /dev/null 2>&1
8+
9+
-jargs_without_clusters="$jargs -Djava.security.manager=allow"
10+
+jargs_without_clusters="$jargs"
11+
jargs="-Dnetbeans.dirs=\"${clusters}\" $jargs_without_clusters"
12+
13+
if [ -z "$cachedirspecified" ]; then

vscode/src/nbcode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export function launch(
107107
if (info.projectSearchRoots) {
108108
ideArgs.push(`-J-Dproject.limitScanRoot="${info.projectSearchRoots}"`);
109109
}
110-
110+
ideArgs.push('-J-DTopSecurityManager.disable=true');
111111
if (info.verbose) {
112112
ideArgs.push('-J-Dnetbeans.logger.console=true');
113113
}

0 commit comments

Comments
 (0)