Skip to content

Commit

Permalink
feat(ledger-plugin): add signature/verification features into Validat…
Browse files Browse the repository at this point in the history
…or/Verifier

Signed-off-by: Takuma TAKEUCHI <takeuchi.takuma@fujitsu.com>
  • Loading branch information
takeutak committed Jan 8, 2021
1 parent e67369f commit a2227eb
Show file tree
Hide file tree
Showing 29 changed files with 405 additions and 34 deletions.
3 changes: 3 additions & 0 deletions examples/cartrade/TransactionEthereum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@ export function makeRawTransaction(txParam: { fromAddress: string, fromAddressPk
// const gasPrice: string = web3.eth.getGasPrice();

const latestNonce = getLatestNonce(txParam.fromAddress);
logger.debug(`#####(A) _nonce: ${_nonce}, latestNonce: ${latestNonce}`);
logger.debug(`####makeRawTransaction(): fromAddress: ${txParam.fromAddress}, txnCount: ${web3.utils.toHex(txnCount)}, latestNonce: ${web3.utils.toHex(latestNonce)}`);
if (txnCount <= latestNonce) {
txnCount = latestNonce + 1;
logger.debug(`####makeRawTransaction(): Adjust txnCount, fromAddress: ${txParam.fromAddress}, txnCount: ${web3.utils.toHex(txnCount)}, latestNonce: ${web3.utils.toHex(latestNonce)}`);
}
logger.debug(`#####(B) _nonce: ${_nonce}, latestNonce: ${latestNonce}, txnCount: ${txnCount}`);
setLatestNonce(txParam.fromAddress, txnCount);

const privKey: Buffer = Buffer.from(txParam.fromAddressPkey, 'hex');
Expand Down Expand Up @@ -97,6 +99,7 @@ function getLatestNonce(fromAddress: string): number {
if (mapFromAddressNonce.has(fromAddress)) {
return mapFromAddressNonce.get(fromAddress);
}
//return 0;
return -1;
}

Expand Down
1 change: 1 addition & 0 deletions examples/cartrade/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"fabric-network": "~1.4.0",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
"jsonwebtoken": "^8.5.1",
"log4js": "^3.0.6",
"morgan": "~1.9.1",
"shelljs": "^0.8.4",
Expand Down
2 changes: 2 additions & 0 deletions packages/config/verifier-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{
"validatorID": "84jUisrs",
"validatorURL": "https://localhost:5050",
"validatorKeyPath": "./validatorKey/84jUisrs/key84jUisrs.crt",
"ledgerInfo": {
"ledgerAbstract": "Go-Ethereum Ledger"
},
Expand Down Expand Up @@ -47,6 +48,7 @@
{
"validatorID": "r9IS4dDf",
"validatorURL": "https://localhost:5040",
"validatorKeyPath": "./validatorKey/r9IS4dDf/keyr9IS4dDf.crt",
"ledgerInfo": {
"ledgerAbstract": "Fabric Ledger"
},
Expand Down
1 change: 1 addition & 0 deletions packages/copyStaticAssets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as shell from 'shelljs';
// NOTE: Copy the static assets to the dist folder.
// Example:
// shell.cp('-R', 'src/routing-interface/views', 'dist/routing-interface/views/');
shell.cp('-R', 'ledger-plugin/validatorKey/', '../dist/packages/ledger-plugin/');
shell.cp('-R', 'config/default.json', '../dist/packages/config/');
shell.cp('-R', 'config/verifier-config.json', '../dist/packages/config/');
shell.cp('-R', 'config/contractInfo.json', '../dist/packages/config/');
Expand Down
201 changes: 201 additions & 0 deletions packages/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
/*
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/en/configuration.html
*/

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/tmp/jest_rx",

// Automatically clear mock calls and instances between every test
// clearMocks: false,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
// coverageDirectory: undefined,

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "json",
// "jsx",
// "ts",
// "tsx",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state between every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state between every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],
roots: [
"<rootDir>/ledger-plugin",
"<rootDir>/routing-interface"
],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jasmine2",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],
transform: {
"^.+\\.(ts|tsx)$": "ts-jest"
},

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};
33 changes: 33 additions & 0 deletions packages/ledger-plugin/ValidatorAuthentication.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2020 Hyperledger Cactus Contributors
* SPDX-License-Identifier: Apache-2.0
*
* ValidatorAuthentication.ts
*/

const fs = require('fs');
const path = require('path');
const jwt = require("jsonwebtoken");
import { config } from '../core/config/default';
import { getLogger } from "log4js";
const logger = getLogger('ValidatorAuthentication[' + process.pid + ']');
logger.level = config.logLevel;

const privateKey = fs.readFileSync(path.resolve(__dirname, config.validatorKeyPath));

export class ValidatorAuthentication {

static sign(payload: object): string {

const option = {
algorithm: 'RS256',
expiresIn: '1000'
}

const signature: string = jwt.sign(payload, privateKey, option);
logger.debug(`signature = ${signature}`);
return signature;

}

}
44 changes: 44 additions & 0 deletions packages/ledger-plugin/VerifierAuthentication.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* Copyright 2020 Hyperledger Cactus Contributors
* SPDX-License-Identifier: Apache-2.0
*
* VerifierAuthentication.ts
*/

import { ConfigUtil } from '../routing-interface/util/ConfigUtil';
const fs = require('fs');
const path = require('path');
const config: any = ConfigUtil.getConfig();
import { getLogger } from "log4js";
const moduleName = 'VerifierAuthentication';
const logger = getLogger(`${moduleName}`);
logger.level = config.logLevel;
const jwt = require("jsonwebtoken");

export class VerifierAuthentication {

static verify(keyPath: string, targetData: string): Promise<any> {
return new Promise((resolve, reject) => {

const publicKey = fs.readFileSync(path.resolve(__dirname, keyPath));

const option = {
algorithms: 'RS256'
}

jwt.verify(targetData, publicKey, option, function(err, decoded) {
if (err) {
// Authentication NG
logger.debug(`Authentication NG : error = ${err}`);
reject(err);
} else {
// Authentication OK
logger.debug(`Authentication OK : decoded = ${JSON.stringify(decoded)}`);
resolve(decoded);
}
});

});
}

}
Loading

0 comments on commit a2227eb

Please sign in to comment.