aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lang/js/src/Connection.js5
-rw-r--r--lang/js/src/Errors.js8
-rw-r--r--lang/js/src/Helpers.js2
-rw-r--r--lang/js/src/Key.js4
-rw-r--r--lang/js/src/Keyring.js144
5 files changed, 129 insertions, 34 deletions
diff --git a/lang/js/src/Connection.js b/lang/js/src/Connection.js
index 3480d811..8c4cba7c 100644
--- a/lang/js/src/Connection.js
+++ b/lang/js/src/Connection.js
@@ -103,7 +103,7 @@ export class Connection{
}
if (!message || !message instanceof GPGME_Message){
this.disconnect();
- return Promise.reject(gpgme_error('PARAM_WRONG'), message);
+ return Promise.reject(gpgme_error('PARAM_WRONG', 'Connection.post'));
}
if (message.isComplete !== true){
this.disconnect();
@@ -221,12 +221,13 @@ class Answer{
if (!this._response.hasOwnProperty(key)){
this._response[key] = [];
}
+
if (Array.isArray(msg[key])) {
for (let i=0; i< msg[key].length; i++) {
this._response[key].push(msg[key][i]);
}
} else {
- this._response[key].push(msg[key][i]);
+ this._response[key].push(msg[key]);
}
}
else {
diff --git a/lang/js/src/Errors.js b/lang/js/src/Errors.js
index 3b53eeb4..2f2bfd5c 100644
--- a/lang/js/src/Errors.js
+++ b/lang/js/src/Errors.js
@@ -74,7 +74,7 @@ const err_list = {
'KEY_NO_INIT': {
msg:'This property has not been retrieved yet from GPG',
type: 'error'
- }
+ },
// generic
'PARAM_WRONG':{
msg: 'Invalid parameter was found',
@@ -118,7 +118,11 @@ class GPGME_Error extends Error{
if (code === 'GNUPG_ERROR' && typeof(msg) === 'string'){
super(msg);
} else if (err_list.hasOwnProperty(code)){
- super(err_list[code].msg);
+ if (msg){
+ super(err_list[code].msg + "--" + msg);
+ } else {
+ super(err_list[code].msg);
+ }
} else {
super(err_list['GENERIC_ERROR'].msg);
}
diff --git a/lang/js/src/Helpers.js b/lang/js/src/Helpers.js
index b26f40fb..5064d03e 100644
--- a/lang/js/src/Helpers.js
+++ b/lang/js/src/Helpers.js
@@ -29,7 +29,6 @@ import { GPGME_Key } from "./Key";
export function toKeyIdArray(input){
if (!input){
- gpgme_error('MSG_NO_KEYS');
return [];
}
if (!Array.isArray(input)){
@@ -61,7 +60,6 @@ export function toKeyIdArray(input){
}
}
if (result.length === 0){
- gpgme_error('MSG_NO_KEYS');
return [];
} else {
return result;
diff --git a/lang/js/src/Key.js b/lang/js/src/Key.js
index 454b1912..d85c8b6e 100644
--- a/lang/js/src/Key.js
+++ b/lang/js/src/Key.js
@@ -207,7 +207,7 @@ export class GPGME_Key {
msg.setParameter('armor', true);
msg.setParameter('keys', me._data.fingerprint);
msg.post().then(function(result){
- me._data.armor = result.data;
+ me._data.armored = result.data;
resolve(result.data);
}, function(error){
reject(error);
@@ -280,7 +280,7 @@ export class GPGME_Key {
/**
* Deletes the public Key from the GPG Keyring. Note that a deletion of a
* secret key is not supported by the native backend.
- * @returns {Boolean} Success if key was deleted, rejects with a GPG error
+ * @returns {Promise<Boolean>} Success if key was deleted, rejects with a GPG error
* otherwise
*/
delete(){
diff --git a/lang/js/src/Keyring.js b/lang/js/src/Keyring.js
index 9081cbe9..c5e613ec 100644
--- a/lang/js/src/Keyring.js
+++ b/lang/js/src/Keyring.js
@@ -18,9 +18,9 @@
* SPDX-License-Identifier: LGPL-2.1+
*/
-import {createMessage} from './Message'
-import {GPGME_Key, createKey} from './Key'
-import { isFingerprint, toKeyIdArray } from './Helpers';
+import {createMessage} from './Message';
+import {createKey} from './Key';
+import { isFingerprint } from './Helpers';
import { gpgme_error } from './Errors';
export class GPGME_Keyring {
@@ -39,10 +39,8 @@ export class GPGME_Keyring {
*
*/
getKeys(pattern, prepare_sync){
- let me = this;
return new Promise(function(resolve, reject) {
- let msg;
- msg = createMessage('keylist');
+ let msg = createMessage('keylist');
if (pattern !== undefined){
msg.setParameter('keys', pattern);
}
@@ -50,25 +48,28 @@ export class GPGME_Keyring {
msg.post().then(function(result){
let resultset = [];
let promises = [];
- // TODO check if result.key is not empty
- for (let i=0; i< result.keys.length; i++){
- let k = createKey(result.keys[i].fingerprint, me);
- k.setKeyData(result.keys[i]);
- if (prepare_sync === true){
- promises.push(k.getArmor());
- promises.push(k.getHasSecret());
+ if (result.keys.length === 0){
+ resolve([]);
+ } else {
+ for (let i=0; i< result.keys.length; i++){
+ let k = createKey(result.keys[i].fingerprint);
+ k.setKeyData(result.keys[i]);
+ if (prepare_sync === true){
+ promises.push(k.getArmor());
+ promises.push(k.getHasSecret());
+ }
+ resultset.push(k);
}
- resultset.push(k);
- }
- if (promises.length > 0) {
- Promise.all(promises).then(function (res){
+ if (promises.length > 0) {
+ Promise.all(promises).then(function() {
+ resolve(resultset);
+ }, function(error){
+ reject(error);
+ });
+ } else {
resolve(resultset);
- }, function(error){
- reject(error);
- });
+ }
}
- }, function(error){
- reject(error);
});
});
}
@@ -80,7 +81,6 @@ export class GPGME_Keyring {
* @returns {Promise<String>} Armored Key blocks
*/
getKeysArmored(pattern) {
- if (pattern)
return new Promise(function(resolve, reject) {
let msg = createMessage('export');
msg.setParameter('armor', true);
@@ -92,10 +92,102 @@ export class GPGME_Keyring {
}, function(error){
reject(error);
});
+ });
}
// getDefaultKey() Big TODO
- // importKeys(armoredKeys)
- // generateKey --> TODO (Andre noch anfragen!)
-};
+ /**
+ *
+ * @param {String} armored Armored Key block of the Kex(s) to be imported into gnupg
+ * @param {Boolean} prepare_sync prepare the keys for synched use (see getKeys()).
+ * @returns {Promise<Array<Object>>} An array of objects for the Keys considered.
+ * Key.key The key itself as a GPGME_Key
+ * Key.status String:
+ * 'nochange' if the Key was not changed,
+ * 'newkey' if the Key was imported in gpg, and did not exist previously,
+ * 'change' if the key existed, but details were updated. For details,
+ * Key.changes is available.
+ * Key.changes.userId: Boolean userIds changed
+ * Key.changes.signature: Boolean signatures changed
+ * Key.changes.subkey: Boolean subkeys changed
+ * // TODO: not yet implemented: Information about Keys that failed
+ * (e.g. malformed Keys, secretKeys are not accepted)
+ */
+ importKey(armored, prepare_sync) {
+ if (!armored || typeof(armored) !== 'string'){
+ return Promise.reject(gpgme_error('PARAM_WRONG'));
+ }
+ let me = this;
+ return new Promise(function(resolve, reject){
+ let msg = createMessage('import');
+ msg.setParameter('data', armored);
+ msg.post().then(function(response){
+ let infos = {};
+ let fprs = [];
+ for (var res=0; res < response.result[0].imports.length; res++) {
+ let result = response.result[0].imports[res];
+ let status = '';
+ if (result.status === 0){
+ status = 'nochange';
+ } else if ((result.status & 1) === 1){
+ status = 'newkey';
+ } else {
+ status = 'change';
+ }
+ let changes = {};
+ changes.userId = (result.status & 2) === 2;
+ changes.signature = (result.status & 4) === 4;
+ changes.subkey = (result.status & 8) === 8;
+ //16 new secret key: not implemented
+
+ fprs.push(result.fingerprint);
+ infos[result.fingerprint] = {
+ changes: changes,
+ status: status
+ };
+ }
+ let resultset = [];
+ if (prepare_sync === true){
+ me.getKeys(fprs, true).then(function(result){
+ for (let i=0; i < result.length; i++) {
+ resultset.push({
+ key: result[i],
+ changes: infos[result[i].fingerprint].changes,
+ status: infos[result[i].fingerprint].status
+ });
+ }
+ resolve(resultset);
+ }, function(error){
+ reject(error);
+ });
+ } else {
+ for (let i=0; i < fprs.length; i++) {
+ resultset.push({
+ key: createKey(fprs[i]),
+ changes: infos[fprs[i]].changes,
+ status: infos[fprs[i]].status
+ });
+ }
+ resolve(resultset);
+ }
+
+ }, function(error){
+ reject(error);
+ });
+
+
+ });
+
+
+ }
+
+ deleteKey(fingerprint){
+ if (isFingerprint(fingerprint) === true) {
+ let key = createKey(fingerprint);
+ key.delete();
+ }
+ }
+
+ // generateKey
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 20:21:51 +0000