Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase iOS temporary keychain unlock time to 6 hours #9906

Merged
merged 4 commits into from
Mar 22, 2019
Merged

Increase iOS temporary keychain unlock time to 6 hours #9906

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b32c46
update keychain unlock time to 6 h
madhurig Mar 22, 2019
29d6abc
Fix L0 tests
madhurig Mar 22, 2019
c6825a0
update version of tasks depending on ios-common-signing
madhurig Mar 22, 2019
a3d62d1
update Xcode version
madhurig Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tasks/Common/ios-signing-common/ios-signing-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ export async function installCertInTemporaryKeychain(keychainPath: string, keych
createKeychainCommand.arg(['create-keychain', '-p', keychainPwd, keychainPath]);
await createKeychainCommand.exec();

//update keychain settings
//update keychain settings, keep keychain unlocked for 6h = 21600 sec, which is the job timeout for paid hosted VMs
let keychainSettingsCommand: ToolRunner = tl.tool(tl.which('security', true));
keychainSettingsCommand.arg(['set-keychain-settings', '-lut', '7200', keychainPath]);
keychainSettingsCommand.arg(['set-keychain-settings', '-lut', '21600', keychainPath]);
await keychainSettingsCommand.exec();
}

Expand Down
2 changes: 1 addition & 1 deletion Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
"code": 0,
"stdout": "keychain created"
},
"/usr/bin/security set-keychain-settings -lut 7200 /build/temp/ios_signing_temp.keychain": {
"/usr/bin/security set-keychain-settings -lut 21600 /build/temp/ios_signing_temp.keychain": {
"code": 0,
"stdout": "keychain settings"
},
Expand Down
2 changes: 1 addition & 1 deletion Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
"code": 0,
"stdout": "keychain created"
},
"/usr/bin/security set-keychain-settings -lut 7200 /build/temp/ios_signing_temp.keychain": {
"/usr/bin/security set-keychain-settings -lut 21600 /build/temp/ios_signing_temp.keychain": {
"code": 0,
"stdout": "keychain settings"
},
Expand Down
2 changes: 1 addition & 1 deletion Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
"code": 0,
"stdout": "keychain created"
},
"/usr/bin/security set-keychain-settings -lut 7200 /build/temp/ios_signing_temp.keychain": {
"/usr/bin/security set-keychain-settings -lut 21600 /build/temp/ios_signing_temp.keychain": {
"code": 0,
"stdout": "keychain settings"
},
Expand Down
4 changes: 2 additions & 2 deletions Tasks/InstallAppleCertificateV2/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/InstallAppleCertificateV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 149,
"Minor": 150,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you're touching iOS common, you'll also have to bump InstallAppleProvisioningProfile and Xcode

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR build caught that error which is good!

"Patch": 0
},
"releaseNotes": "Fixes codesign hangs on a self hosted agent. Keychain password is now required to use `Default Keychain` or `Custom Keychain`. Microsoft hosted builds should use `Temporary Keychain`.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/InstallAppleCertificateV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 149,
"Minor": 150,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
2 changes: 1 addition & 1 deletion Tests-Legacy/L0/XcodeV5/responseSigningFile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"code": 0,
"stdout": "temporary keychain created"
},
"/usr/bin/security set-keychain-settings -lut 7200 /user/build/_xcodetasktmp.keychain": {
"/usr/bin/security set-keychain-settings -lut 21600 /user/build/_xcodetasktmp.keychain": {
"code": 0,
"stdout": "set-keychain-settings on temporary keychain output"
},
Expand Down