Skip to content

Commit 7d3910d

Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from #29216 (comment) Backport-PR-URL: #32527 PR-URL: #31459 Refs: #29216 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ash Cripps <ashley.cripps@ibm.com> Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d

6 files changed

Lines changed: 77 additions & 1 deletion

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
--resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
--package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.

‎tools/osx-codesign.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
--sign "$SIGN" \
17+
--entitlements tools/osx-entitlements.plist \
18+
--options runtime \
19+
--timestamp \
20+
"$PKGDIR"/bin/node

‎tools/osx-entitlements.plist‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.allow-jit</key>
6+
<true/>
7+
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
<true/>
9+
<key>com.apple.security.cs.disable-executable-page-protection</key>
10+
<true/>
11+
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
<true/>
13+
<key>com.apple.security.cs.disable-library-validation</key>
14+
<true/>
15+
</dict>
16+
</plist>

‎tools/osx-gon-config.json.tmpl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
}],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
}
12+
}

‎tools/osx-notarize.sh‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
(cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
build: macOS package notarization · nodejs/node@7d3910d · GitHub
Skip to content
Commit 7d3910d
Browse files
rvaggMylesBorins
rvagg
authored and
MylesBorins
committed
build: macOS package notarization
Includes hardened-runtime patch from gdams from
#29216 (comment)
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
1 parent 6db190b commit 7d3910d
6 files changed
Lines changed: 77 additions & 1 deletion
File tree
‎.gitignore‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
/doc/api.xml
3434
/node
3535
/node_g
36+
/gon-config.json
3637
/*.exe
3738
/*.swp
3839
/out
‎Makefile‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ $(PKG): release-only
10101010
 --resources $(MACOSOUTDIR)/installer/productbuild/Resources \
10111011
 --package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
10121012
	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
1013+
	bash tools/osx-notarize.sh $(FULLVERSION)
10131014

10141015
.PHONY: pkg
10151016
# Builds the macOS installer for releases.
‎tools/osx-codesign.sh‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@ if [ "X$SIGN" == "X" ]; then
88
exit 0
99
fi
1010

11-
codesign -s "$SIGN""$PKGDIR"/bin/node
11+
# All macOS executable binaries in the bundle must be codesigned with the
12+
# hardened runtime enabled.
13+
# See https://github.com/nodejs/node/pull/31459
14+
15+
codesign \
16+
 --sign "$SIGN" \
17+
 --entitlements tools/osx-entitlements.plist \
18+
 --options runtime \
19+
 --timestamp \
20+
"$PKGDIR"/bin/node
‎tools/osx-entitlements.plist‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
 <?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPEplist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plistversion="1.0">
4+
<dict>
5+
 <key>com.apple.security.cs.allow-jit</key>
6+
 <true/>
7+
 <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
 <true/>
9+
 <key>com.apple.security.cs.disable-executable-page-protection</key>
10+
 <true/>
11+
 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
12+
 <true/>
13+
 <key>com.apple.security.cs.disable-library-validation</key>
14+
 <true/>
15+
</dict>
16+
</plist>
‎tools/osx-gon-config.json.tmpl‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"notarize": [{
3+
"path": "node-{{pkgid}}.pkg",
4+
"bundle_id": "org.nodejs.pkg.{{pkgid}}",
5+
"staple": true
6+
 }],
7+
8+
"apple_id": {
9+
"username": "{{appleid}}",
10+
"password": "@env:NOTARIZATION_PASSWORD"
11+
 }
12+
}
‎tools/osx-notarize.sh‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
4+
# with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
5+
6+
set -e
7+
8+
gon_version="0.2.2"
9+
gon_exe="${HOME}/.gon/gon_${gon_version}"
10+
11+
__dirname="$(CDPATH= cd"$(dirname "${BASH_SOURCE[0]}")"&& pwd)"
12+
pkgid="$1"
13+
14+
if [ "X${pkgid}"=="X" ];then
15+
echo"Usage: $0 <pkgid>"
16+
exit 1
17+
fi
18+
19+
if [ "X$NOTARIZATION_ID"=="X" ];then
20+
echo"No NOTARIZATION_ID environment var. Skipping notarization."
21+
exit 0
22+
fi
23+
24+
set -x
25+
26+
mkdir -p "${HOME}/.gon/"
27+
28+
if [ !-f"${gon_exe}" ];then
29+
 curl -sL "https://github.com/mitchellh/gon/releases/download/v${gon_version}/gon_${gon_version}_macos.zip" -o "${gon_exe}.zip"
30+
 (cd "${HOME}/.gon/"&& rm -f gon && unzip "${gon_exe}.zip"&& mv gon "${gon_exe}")
31+
fi
32+
33+
cat tools/osx-gon-config.json.tmpl \
34+
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
35+
> gon-config.json
36+
37+
"${gon_exe}" -log-level=info gon-config.json
0 commit comments
Comments
 (0)