js: consistently return uppercase fingerprint

--

* src/Key.js: the fingerprint returned by a Key is now always upper
  case hex, even if the constructor had lower case input. This is to be
  more consistent with gpgme and to be more readable and reliable in
  comparisions.
This commit is contained in:
Maximilian Krambach 2018-08-16 11:25:50 +02:00
parent 68a012deb3
commit 622db0d1de
4 changed files with 51 additions and 2 deletions

View File

@ -15,6 +15,7 @@
<script src="tests/inputvalues.js"></script> <script src="tests/inputvalues.js"></script>
<!-- insert tests here--> <!-- insert tests here-->
<script src="tests/startup.js"></script> <script src="tests/startup.js"></script>
<script src="tests/KeyInfos.js"></script>
<script src="tests/encryptTest.js"></script> <script src="tests/encryptTest.js"></script>
<script src="tests/encryptDecryptTest.js"></script> <script src="tests/encryptDecryptTest.js"></script>
<script src="tests/signTest.js"></script> <script src="tests/signTest.js"></script>

View File

@ -0,0 +1,46 @@
/* gpgme.js - Javascript integration for gpgme
* Copyright (C) 2018 Bundesamt für Sicherheit in der Informationstechnik
*
* This file is part of GPGME.
*
* GPGME is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* GPGME is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
* SPDX-License-Identifier: LGPL-2.1+
*
* Author(s):
* Maximilian Krambach <mkrambach@intevation.de>
*/
/* global describe, it, expect, before, Gpgmejs */
/* global inputvalues, fixedLengthString */
describe('Key information', function () {
let context = null;
before(function(done){
const prm = Gpgmejs.init();
prm.then(function(gpgmejs){
context = gpgmejs;
done();
});
});
it('A fingerprint is consistently returned upper case hex', function(done){
const mixedCase = inputvalues.encrypt.good.fingerprint_mixedcase;
context.Keyring.getKeys(mixedCase).then(function(result){
expect(result).to.be.an('array');
expect(result.length).to.equal(1);
expect(result[0].fingerprint).to.equal(mixedCase.toUpperCase());
done();
});
});
});

View File

@ -28,6 +28,7 @@ const inputvalues = {// eslint-disable-line no-unused-vars
// Fingerprint of a key that has been imported to gnupg // Fingerprint of a key that has been imported to gnupg
// (i.e. see testkey.pub; testkey.sec) // (i.e. see testkey.pub; testkey.sec)
fingerprint : 'D41735B91236FDB882048C5A2301635EEFF0CB05', fingerprint : 'D41735B91236FDB882048C5A2301635EEFF0CB05',
fingerprint_mixedcase: 'D41735B91236fdb882048C5A2301635eeFF0Cb05',
data_nonascii: '¡Äußerste µ€ før ñoquis@hóme! Добрый день', data_nonascii: '¡Äußerste µ€ før ñoquis@hóme! Добрый день',
// used for checking encoding consistency in > 2MB messages. // used for checking encoding consistency in > 2MB messages.

View File

@ -58,7 +58,7 @@ export class GPGME_Key {
*/ */
this.isAsync = async; this.isAsync = async;
let _data = {fingerprint: fingerprint}; let _data = {fingerprint: fingerprint.toUpperCase()};
this.getFingerprint = function(){ this.getFingerprint = function(){
if (!_data.fingerprint || !isFingerprint(_data.fingerprint)){ if (!_data.fingerprint || !isFingerprint(_data.fingerprint)){
return gpgme_error('KEY_INVALID'); return gpgme_error('KEY_INVALID');
@ -88,7 +88,8 @@ export class GPGME_Key {
if (typeof(data) !== 'object') { if (typeof(data) !== 'object') {
return gpgme_error('KEY_INVALID'); return gpgme_error('KEY_INVALID');
} }
if (!data.fingerprint || data.fingerprint !== _data.fingerprint){ if (!data.fingerprint ||
data.fingerprint.toUpperCase() !== _data.fingerprint){
return gpgme_error('KEY_INVALID'); return gpgme_error('KEY_INVALID');
} }
let keys = Object.keys(data); let keys = Object.keys(data);