Skip to content

Commit 8d4f6ae

Browse files
zawatazawata
committed
update pageant and key, drop win32 sha1 test
1 parent 7404623 commit 8d4f6ae

12 files changed

Lines changed: 36 additions & 86 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,16 @@ jobs:
161161
run: npm install
162162

163163
- name: Test
164+
# need arm64 runners or an emulator to run tests
164165
if: matrix.arch != 'arm64'
165166
env:
166167
GIT_SSH: ${{ github.workspace }}\vendor\plink.exe
167168
run: |
168-
powershell -command "Start-Process ${{ github.workspace }}\vendor\pageant.exe ${{ github.workspace }}\vendor\private.ppk"
169+
$encodedKey = Get-Content -Path test\private.ppk.enc
170+
$finalPath = Join-Path -Path $HOME -ChildPath .ssh_tests\private.ppk
171+
mkdir ~\.ssh_tests
172+
Set-Content -Value $([System.Convert]::FromBase64String($encodedKey)) -Path $finalPath -AsByteStream
173+
powershell -command "Start-Process .\vendor\pageant\pageant_${{ matrix.arch }}.exe $finalPath"
169174
node utils/retry npm test
170175
171176
# You're probably wondering why this isn't a single `run: |` step, it certainly is for *nix,

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@ jsconfig.json
4848

4949
test/id_rsa
5050
test/nodegit-test-rsa
51+
test/private.ppk

‎test/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ function unencryptKey(fileName) {
4040
.toString('ascii');
4141
fs.writeFileSync(path.join(__dirname, fileName), asciiContents, 'utf8');
4242
}
43+
44+
unencryptKey('private.ppk');
4345
unencryptKey('id_rsa');
4446
unencryptKey('nodegit-test-rsa');
4547

‎test/private.ppk.enc‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
UHVUVFktVXNlci1LZXktRmlsZS0zOiBzc2gtcnNhCkVuY3J5cHRpb246IG5vbmUKQ29tbWVudDog
2+
aW1wb3J0ZWQtb3BlbnNzaC1rZXkKUHVibGljLUxpbmVzOiA2CkFBQUFCM056YUMxeWMyRUFBQUFE
3+
QVFBQkFBQUJBUURNS29yYnVrUzZvd1VHZjJpb2RLT3ljajd4YXJtZ2NBSVkKUXlZbHpZUEROUGN5
4+
YSs5TzdQb0JEbnYvSXI3SU4rL2hOaVhLSlMyOERJQ29yL3MwZ3dWMUpsWlR4di9vSmdBYwp1bm83
5+
Y25GZ1VvOFBXUnkzU25wU0xqQ1Z3Z3dOWEtTZS8vRjV3aGZLeU1SVms4bE9XQ0hqaU5qS2J3QmJE
6+
emh6CmpjTGVQTkloc2NaazhLdXEvKzdNZi9KWmlsaVNqRURYRGI3OG92Z0M4K0wwcEM4alA5cUxJ
7+
ZVBEc1BkanArMW0KNmNXRnl1QWNaNGV0SFJHdFk1K3VhOFpyNXA3NHNPdndVNUluUDFKTjl5Q2w2
8+
eVJ6VnppUDVrQVR6Q3JEeHB1RApNaGRhc2FlcjlNODFHbkJJZUhUSG83SHFIYkJUNFUzdDB4K254
9+
eXJNdnE3TnQ0WDBqTDVWClByaXZhdGUtTGluZXM6IDE0CkFBQUJBSGYwTXR1QWFDc2o1cXIzcHB6
10+
NjBzYmdXdHpxc0o5eno3ZERsS0UzUzBnZzBYQWRmRi9wMmNWUEpra3oKdDlYWkQ2WkpjeEIrb1kx
11+
UDV6TzFHYW16cFR3OFJ4STM1RmtZSW82K2ZWeDZFK1RjL05LdXI3RjlIN3N6Q2phaQo2UVBjdjVm
12+
dmxvZk1Jc0J4RHZHY3YvUzQwVWhuT2NCT1VXNHUxaU1HVWt6U2ZUOXZybWxBTzZ1bWhxMUlXRVE2
13+
Cmc5RUJRei82b1FQU1ZQKzNUYjBuaXpmVitaSEJKUDEvY1RHbHZhc29rRTk4L0t1aUJqMnhwd21S
14+
R3MveWJ3cjEKVkxtNFZWRUpBOUtEQjlqV255eC9KVTJ6S0N1K3lTMUhwS3F1VnRIeTVMOHYrQ0cy
15+
UFJDbVJ6RnBFUG1UaWhqWgorL0dsbXEzcGNzUWErYVVkV25Rb3E5MlVxbUVBQUFDQkFQK1JTeGpR
16+
NEw1MDY0SUtOc3BxckVaWkdlZWJldGgxCk1yL3JEb2djc2UvRktqQ2ZuSFFvUXlFTy93V3ZPRGow
17+
bTY2QU8xOXIzMWcvakRhclU3bXBVQ0xzVWJVUjg3SVYKK0ZXUE4xY05rQlc4dzJiN3pVRnAwK2E1
18+
b2gva0ZpZ3NDNmczTER6YU9jY0tzNGxvSzFiekdBMklZdU04N0hnSwpLK0Q4N3VrQXhIVUpBQUFB
19+
Z1FETWd2dW9wWVNIa0p4RVdLUnlkODhraitDc2ZMU3NhSU9tREtybnVlVmh3MW1ZCkFzWmxHMnZ1
20+
RUxKa3g3ZlpwWWNoWXV2V1NGbTB6T1VCdDg4QnZzeTNiWTUwRmpiQS9YQmVqU1NkZlZaSkZLOFEK
21+
ckxYV250T01UWVJNOHZNRjlFRytzUElDODdLOUhrMUNXUUUzYlR3d1BLdEcxcXI2SXpxcTk2bkZS
22+
Zzk5N1FBQQpBSUVBd05IRFoyVGdKMFdFb1RzSi9aUnI5YVVjeDNXTHU1OWxKc3MyZDNaeEI1VExV
23+
UlVHUWR2NzMwMmFWM2pDCk5xMTNSVUdXcUdhN3BYM1RCSktRbFlraDRrR2FpZW1QbXI4T3VPY09j
24+
SkRrRWtNSDk3UEJmdnlzbzl1TjluSjQKdThmajNudmM4eHJud3JTT2hVZm9VcmVrYjdKUnUwRjEv
25+
c2JPN1pRZW51QngzMEE9ClByaXZhdGUtTUFDOiBhZDU5MDFhMTUwNTI3OWI2NDBlZjkyYjc2ZWIz
26+
NzkzM2Q5MjhjNjBkMWRlNzZlMzA3ODJlNzJiMzA0MDUwYmE3Cg==

‎test/tests/clone.js‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ var assert = require("assert");
33
var fse = require("fs-extra");
44
var local = path.join.bind(path, __dirname);
55
var _ = require("lodash");
6-
const util = require("util");
7-
const exec = util.promisify(require("child_process").exec);
86

97

108
const generatePathWithLength = (base, length) => {
@@ -237,62 +235,6 @@ describe("Clone", function() {
237235
});
238236
});
239237

240-
if (process.platform === "win32") {
241-
it("can clone with ssh using old agent with sha1 signing support only",
242-
async function () {
243-
var pageant = local("../../vendor/pageant.exe");
244-
var old_pageant = local("../../vendor/pageant_sha1.exe");
245-
var privateKey = local("../../vendor/private.ppk");
246-
var test = this;
247-
var url = "git@github.com:nodegit/test.git";
248-
var opts = {
249-
fetchOpts: {
250-
callbacks: {
251-
certificateCheck: () => 0,
252-
credentials: function(url, userName) {
253-
return NodeGit.Credential.sshKeyFromAgent(userName);
254-
}
255-
}
256-
}
257-
};
258-
259-
try {
260-
await exec("taskkill /im pageant.exe /f /t");
261-
} catch (e) {
262-
try {
263-
await exec("taskkill /im pageant_sha1.exe /f /t");
264-
} catch(e) {}
265-
}
266-
try {
267-
await exec(`powershell -command "Start-Process ${old_pageant} ${privateKey}`);
268-
} catch (e) {
269-
try {
270-
await exec(`powershell -command "Start-Process ${pageant} ${privateKey}`);
271-
} catch (e) {}
272-
return assert.fail("Cannot run old pageant");
273-
}
274-
275-
try {
276-
const repo = await Clone(url, clonePath, opts);
277-
test.repository = repo;
278-
} catch(e) {
279-
return assert.fail("Clone error: " + e.message);
280-
}
281-
282-
try {
283-
await exec("taskkill /im pageant_sha1.exe /f /t");
284-
} catch(e) {}
285-
286-
try {
287-
await exec(`powershell -command "Start-Process ${pageant} ${privateKey}`);
288-
} catch (e) {
289-
return assert.fail("Cannot run pageant");
290-
}
291-
292-
return assert.ok(test.repository instanceof Repository);
293-
});
294-
}
295-
296238
it("can clone with ssh", function() {
297239
var test = this;
298240
var url = "git@github.com:nodegit/test.git";

‎test/tests/remote.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ describe("Remote", function() {
302302
credentials: function(url, userName) {
303303
if (firstPass) {
304304
firstPass = false;
305-
return NodeGit.Credential.sshKeyFromAgent(userName);
305+
return NodeGit.Credential.defaultNew();
306306
}
307307
},
308308
certificateCheck: () => 0

‎vendor/pageant.exe‎

-663 KB
Binary file not shown.

‎vendor/pageant/pageant_arm64.exe‎

880 KB
Binary file not shown.

‎vendor/pageant/pageant_x64.exe‎

914 KB
Binary file not shown.

‎vendor/pageant/pageant_x86.exe‎

831 KB
Binary file not shown.

0 commit comments

Comments
 (0)