Merge branch 'master' into master

Author: drudge

.github/workflows/test.yaml

@@ -0,0 +1,21 @@
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        node: [ 14, 16, 18 ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install
+      - run: npm test

.travis.yml

@@ -1,5 +1,5 @@
-#  Basic Keychain Access on Mac computers running Node.js 
-[![Build Status](https://travis-ci.org/drudge/node-keychain.svg)](https://travis-ci.org/drudge/node-keychain)
+#  Basic Keychain Access on Mac computers running Node.js
+[![Build Status](https://img.shields.io/github/actions/workflow/status/drudge/node-keychain/test.yaml?branch=master)](https://github.com/drudge/node-keychain/actions/workflows/test.yaml)
 
   This module adds methods for basic Keychain access in Node.js by way of the `security` command-line tool.
 
@@ -45,6 +45,9 @@ The available
 keychain.setPassword(options[, callback]);
 keychain.getPassword(options, callback);
 keychain.deletePassword(options[, callback]);
+keychain.createKeychain(options[, callback]);
+keychain.deleteKeychain(options[, callback]);
+keychain.setDefaultKeychain(options[, callback]);
 ```
 
 ### Options
@@ -57,6 +60,7 @@ Available params you can pass to the options object:
 | `service` | Specify service name (required) |
 | `password` | Specify password to be added (required for `setPassword`) |
 | `type` | The type of password to get or save. Supported values are `generic` and `internet`. See [docs](https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man1/security.1.html). Default: `generic` |
+| `keychainName` | Specify the name of the keychain (required for 'createKeychain' and 'deleteKeychain') |
 
 ## Contributors
 

README.md

@@ -244,6 +244,127 @@ KeychainAccess.prototype.deletePassword = function(opts, fn) {
   });
 };
 
+/**
+* Create a new keychain to be used in the system.
+*
+* @param {Object} opts Object containing 'keychainName' and `password`
+* @param {Function} fn Callback
+* @api public
+*/
+KeychainAccess.prototype.createKeychain = function(opts, fn) {
+  opts = opts || {};
+  fn = fn || noop;
+
+  if (!opts.keychainName) {
+    err = new KeychainAccess.errors.NoKeychainNameProvidedError();
+    fn(err, null);
+    return;
+  }
+
+  if (!opts.password) {
+    err = new KeychainAccess.errors.NoPasswordProvidedError();
+    fn(err, null);
+    return;
+  }
+
+  var security = spawn(this.executablePath, [ 'create-keychain', '-p', opts.password, opts.keychainName]);
+
+  security.on('error', function(err) {
+    err = new KeychainAccess.errors.ServiceFailureError(null, err.message);
+    fn(err, null);
+    return;
+  });
+
+  security.on('close', function(code, signal) {
+    if (code !== 0) {
+      var msg = 'Security returned a non-successful error code: ' + code;
+      err = new KeychainAccess.errors.ServiceFailureError(msg);
+      err.exitCode = code;
+      fn(err);
+      return;
+    } else {
+      fn(null, opts.keychainName);
+    }
+  });
+};
+
+/**
+* Delete a keychain from the system.
+*
+* @param {Object} opts Object containing 'keychainName'
+* @param {Function} fn Callback
+* @api public
+*/
+KeychainAccess.prototype.deleteKeychain = function(opts, fn) {
+  opts = opts || {};
+  fn = fn || noop;
+
+  if (!opts.keychainName) {
+    err = new KeychainAccess.errors.NoKeychainNameProvidedError();
+    fn(err, null);
+    return;
+  }
+
+  var security = spawn(this.executablePath, [ 'delete-keychain', opts.keychainName]);
+
+  security.on('error', function(err) {
+    err = new KeychainAccess.errors.ServiceFailureError(null, err.message);
+    fn(err, null);
+    return;
+  });
+
+  security.on('close', function(code, signal) {
+    if (code !== 0) {
+      var msg = 'Security returned a non-successful error code: ' + code;
+      err = new KeychainAccess.errors.ServiceFailureError(msg);
+      err.exitCode = code;
+      fn(err);
+      return;
+    } else {
+      fn(null, opts.keychainName);
+    }
+  });
+
+};
+
+/**
+* Set the default keychain for the system.
+*
+* @param {Object} opts Object containing 'keychainName'
+* @param {Function} fn Callback
+* @api public
+*/
+KeychainAccess.prototype.setDefaultKeychain = function(opts, fn) {
+  opts = opts || {};
+  fn = fn || noop;
+
+  if (!opts.keychainName) {
+    err = new KeychainAccess.errors.NoKeychainNameProvidedError();
+    fn(err, null);
+    return;
+  }
+
+  var security = spawn(this.executablePath, [ 'default-keychain', '-s', opts.keychainName]);
+
+  security.on('error', function(err) {
+    err = new KeychainAccess.errors.ServiceFailureError(null, err.message);
+    fn(err, null);
+    return;
+  });
+
+  security.on('close', function(code, signal) {
+    if (code !== 0) {
+      var msg = 'Security returned a non-successful error code: ' + code;
+      err = new KeychainAccess.errors.ServiceFailureError(msg);
+      err.exitCode = code;
+      fn(err);
+      return;
+    } else {
+      fn(null, opts.keychainName);
+    }
+  });
+};
+
 function errorClass(code, defaultMsg) {
   var errorType = code + 'Error';
   var ErrorClass = function (msg, append) {
@@ -265,6 +386,7 @@ errorClass('NoServiceProvided', 'A service is required');
 errorClass('NoPasswordProvided', 'A password is required');
 errorClass('ServiceFailure', 'Keychain failed to start child process: ');
 errorClass('PasswordNotFound', 'Could not find password');
+errorClass('NoKeychainNameProvided', 'A keychain name is required');
 
 
 /**