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.

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

Очистка CommonName от лишних кавычек #44

Closed
wants to merge 77 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
70a563e
custom errors
kernusr Feb 12, 2021
e70f108
Возврат ошибок с кодом.
kernusr Feb 13, 2021
8754d59
fix
kernusr Feb 13, 2021
b0e0974
2.2.1
kernusr Feb 13, 2021
c0b100a
Очистка CommonName от лишних кавычек
kernusr Mar 17, 2021
60a134d
Merge branch 'master' into custom
kernusr Mar 17, 2021
af73897
Release 2.2.2
kernusr Mar 17, 2021
a81294a
add attached and detached signature
gaarutyunov Mar 23, 2021
419afe4
lint fix
gaarutyunov Mar 23, 2021
4096e08
added exports
gaarutyunov Mar 23, 2021
17e248e
added verfification
gaarutyunov Mar 23, 2021
19a9bab
fixed signature verification
gaarutyunov Mar 23, 2021
5225ee9
doc fix
gaarutyunov Mar 23, 2021
67ed9f6
added all user certificates
gaarutyunov May 7, 2021
fdb8c7c
added all user certificates
gaarutyunov May 7, 2021
bf3be50
added all user certificates
gaarutyunov May 7, 2021
4f29faf
added all user certificates
gaarutyunov May 7, 2021
a0d60b0
add getPluginVersion & getCspVersion methods
AlexNoodl May 12, 2021
ebe130c
fix test
AlexNoodl May 12, 2021
a7a3ea8
fix package-lock
AlexNoodl May 12, 2021
bccc0c9
Merge pull request #1 from gaarutyunov/systeminfo
gaarutyunov May 12, 2021
e27a801
Update index.ts
gaarutyunov May 12, 2021
1d21551
Bump ws from 7.2.3 to 7.4.6
dependabot[bot] May 31, 2021
8549f41
Поправил тесты
kernusr Jun 4, 2021
da47636
Merge remote-tracking branch 'cosign/master' into custom
kernusr Jun 4, 2021
f9c5214
Bump dns-packet from 1.3.1 to 1.3.4 in /examples/angular
dependabot[bot] Jun 4, 2021
06e68c9
Поправил тесты
kernusr Jun 4, 2021
7256536
Merge pull request #3 from kernusr/custom
kernusr Jun 4, 2021
119501f
Merge pull request #2 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
8ad740c
Merge pull request #1 from kernusr/dependabot/npm_and_yarn/ws-7.4.6
kernusr Jun 4, 2021
a905e54
Bump ssri from 6.0.1 to 6.0.2 in /examples/angular
dependabot[bot] Jun 4, 2021
1c5bd5c
Bump browserslist from 4.10.0 to 4.16.6 in /examples/angular
dependabot[bot] Jun 4, 2021
ca0781b
Bump hosted-git-info from 2.8.8 to 2.8.9 in /examples/angular
dependabot[bot] Jun 4, 2021
fd657ed
Bump lodash from 4.17.15 to 4.17.21 in /examples/angular
dependabot[bot] Jun 4, 2021
b4372dc
Merge pull request #7 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
38130ec
Merge pull request #6 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
0ee6b79
Merge pull request #4 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
541648c
Merge pull request #5 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
4345d56
Bump url-parse from 1.4.7 to 1.5.1 in /examples/angular
dependabot[bot] Jun 4, 2021
12b6254
Bump y18n from 4.0.0 to 4.0.3 in /examples/angular
dependabot[bot] Jun 4, 2021
47c9083
Bump elliptic from 6.5.2 to 6.5.4 in /examples/angular
dependabot[bot] Jun 4, 2021
9a8295d
Merge pull request #10 from kernusr/dependabot/npm_and_yarn/examples/…
kernusr Jun 4, 2021
741fd5c
Merge pull request #9 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
0938089
Merge pull request #8 from kernusr/dependabot/npm_and_yarn/examples/a…
kernusr Jun 4, 2021
5a40870
Обновил зависимости
kernusr Jun 4, 2021
dcae2f3
Merge pull request #16 from kernusr/updates
kernusr Jun 4, 2021
edca31a
2.3.0
kernusr Jun 4, 2021
91934ec
2.3.0-examples
kernusr Jun 4, 2021
d8f2ba6
Merge pull request #17 from kernusr/release-2.3.0-prepare
kernusr Jun 4, 2021
6656c5d
change license authors
kernusr Sep 14, 2021
bbd5434
Прекращена поддержка примеров на React и Angular
kernusr Sep 14, 2021
31669dd
Исправления в readme
kernusr Sep 14, 2021
ca1411d
Поправил описание
kernusr Sep 14, 2021
9cda106
Передал репозиторий в webmasterskaya
kernusr Sep 14, 2021
5cf3738
Bump tar from 6.0.1 to 6.1.9 (#19)
dependabot[bot] Sep 14, 2021
52f4ba1
Update dependencies
kernusr Sep 14, 2021
c9d3f49
Поправил пример для работы с crypto-pro-js
kernusr Sep 14, 2021
a99231b
Поправил меню
kernusr Sep 14, 2021
34b4e23
Update cadesplugin_api to v.2.3.1
kernusr Sep 14, 2021
0a315c5
Добавил в readme описание по вопросу ошибки в #20
kernusr Sep 14, 2021
d18436d
Удалил поддержку примеров Angular и React
kernusr Sep 15, 2021
9f38d46
Release 2.3.1
kernusr Sep 15, 2021
f21a69b
FIX bower config
kernusr Sep 15, 2021
15a1b84
v.2.3.1 Release (#21)
kernusr Sep 15, 2021
73dd1c8
Release 2.3.1
kernusr Sep 15, 2021
9d60469
Merge branch 'master' into stage
kernusr Sep 15, 2021
7e43d21
Merge pull request #22 from webmasterskaya/stage
kernusr Sep 15, 2021
b5e7748
GitHub actions (#24)
kernusr Jun 22, 2022
5ebb1a0
Bump minimist from 1.2.5 to 1.2.6 (#23)
dependabot[bot] Jun 22, 2022
484c114
Bump ansi-regex from 4.1.0 to 4.1.1 (#25)
dependabot[bot] Jun 22, 2022
652cc4d
Обновил adesplagin_api.js до 2.3.2 (#26)
kernusr Jun 22, 2022
51ed504
Добавил новые методы для получения сертификатов (#28)
kernusr Jun 23, 2022
db9b5e0
2.3.2 release (#29)
kernusr Jun 23, 2022
aab6c56
Bump terser from 4.8.0 to 4.8.1 (#30)
dependabot[bot] Nov 10, 2022
319068f
run test only on node 16 (#38)
kernusr Nov 10, 2022
35d9990
Обновил зависимости (#39)
kernusr Nov 11, 2022
c09fac3
Исправления в соответсвии с приказом ФСБ России (#40)
kernusr Nov 11, 2022
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
46 changes: 46 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: CryptoPRO tests

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]


jobs:
buildAndTest:
runs-on: ubuntu-20.04

strategy:
matrix:
node-version: [ 16 ]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
check-latest: true

- name: Clean install, build, test
run: |
npm ci
npm run build --if-present --openssl-legacy-provider
npm test

lint:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v3
with:
node-version: 16
check-latest: true

- name: Clean install, lint
run: |
npm ci
npm run lint
3 changes: 0 additions & 3 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MIT License

Copyright (c) 2020 Vitalii Goma
Copyright (c) 2021 Artem Vasilev

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
343 changes: 34 additions & 309 deletions README.md

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{
"name": "crypto-pro",
"description": "API для взаимодействия с КриптоПро",
"main": "./lib/crypto-pro.js",
"name": "crypto-pro-js",
"description": "Асинхронный JavaScript API для работы с КриптоПРО ЭЦП Browser Plug-In. Forked from https://github.com/vgoma/crypto-pro",
"main": "./lib/crypto-pro-js.js",
"authors": [
"kern.usr <kern.usr@gmail.com>",
"vgoma <vgoma@yandex.ru>"
],
"license": "MIT",
"keywords": [
"crypto",
"cryptopro",
"crypto-pro",
"crypto-pro-js",
"cades",
"КриптоПро",
"Крипто ПРО"
],
"homepage": "https://github.com/vgoma/crypto-pro",
"homepage": "https://github.com/webmasterskaya/crypto-pro-js",
"ignore": [
"**/.*",
"/*.js",
Expand Down
8 changes: 8 additions & 0 deletions dist/api/addAttachedSignature.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Добавляет присоединенную подпись к подписанному сообщению по отпечатку сертификата
*
* @param thumbprint - отпечаток сертификата
* @param signedMessage - подписанное сообщение
* @returns подпись в формате PKCS#7
*/
export declare const addAttachedSignature: (thumbprint: string, signedMessage: string | ArrayBuffer) => Promise<string>;
9 changes: 9 additions & 0 deletions dist/api/addDetachedSignature.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* Добавляет отсоединенную подпись хеша к подписанному сообщению по отпечатку сертификата
*
* @param thumbprint - отпечаток сертификата
* @param signedMessage - подписанное сообщение
* @param messageHash - хеш подписываемого сообщения, сгенерированный по ГОСТ Р 34.11-2012 256 бит
* @returns подпись в формате PKCS#7
*/
export declare const addDetachedSignature: (thumbprint: string, signedMessage: string | ArrayBuffer, messageHash: string) => Promise<string>;
9 changes: 0 additions & 9 deletions dist/api/createSignature.d.ts

This file was deleted.

8 changes: 8 additions & 0 deletions dist/api/getAllCertificates.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Certificate } from './certificate';
/**
* Возвращает список сертификатов, доступных пользователю из пользовательского хранилища и закрытых ключей, не установленных в системе, без фильтрации по дате и наличию приватного ключа
*
* @param resetCache = false - позволяет сбросить кэш ранее полученных сертификатов
* @returns список сертификатов
*/
export declare const getAllCertificates: (resetCache?: boolean) => Promise<Certificate[]>;
9 changes: 9 additions & 0 deletions dist/api/getAllContainerCertificates.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Certificate } from './certificate';
/**
* Начиная с версии плагина 2.0.13292 есть возможность получить сертификаты из закрытых ключей
* Возвращает все сертификаты без фильтрации по дате и наличию приватного ключа
*
* @param resetCache = false - позволяет сбросить кэш ранее полученных сертификатов
* @returns список сертификатов
*/
export declare const getAllContainerCertificates: (resetCache?: boolean) => Promise<Certificate[]>;
8 changes: 8 additions & 0 deletions dist/api/getAllUserCertificates.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Certificate } from './certificate';
/**
* Возвращает все сертификаты без фильтрации по дате и наличию приватного ключа
*
* @param resetCache = false - позволяет сбросить кэш ранее полученных сертификатов
* @returns список сертификатов
*/
export declare const getAllUserCertificates: (resetCache?: boolean) => Promise<Certificate[]>;
3 changes: 2 additions & 1 deletion dist/api/getCertificate.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Certificate } from './certificate';
* Возвращает сертификат по отпечатку
*
* @param thumbprint - отпечаток сертификата
* @param validOnly - проверять сертификаты по дате и наличию приватного ключа
* @returns сертификат
*/
export declare const getCertificate: (thumbprint: string) => Promise<Certificate>;
export declare const getCertificate: (thumbprint: string, validOnly?: boolean) => Promise<Certificate>;
8 changes: 8 additions & 0 deletions dist/api/getCertificates.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Certificate } from './certificate';
/**
* Возвращает список сертификатов, доступных пользователю из пользовательского хранилища и закрытых ключей, не установленных в системе
*
* @param resetCache = false - позволяет сбросить кэш ранее полученных сертификатов
* @returns список сертификатов
*/
export declare const getCertificates: (resetCache?: boolean) => Promise<Certificate[]>;
9 changes: 9 additions & 0 deletions dist/api/getContainerCertificates.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Certificate } from './certificate';
/**
* Начиная с версии плагина 2.0.13292 есть возможность получить сертификаты из закрытых ключей
* Возвращает список сертификатов, доступных пользователю в системе
*
* @param resetCache = false - позволяет сбросить кэш ранее полученных сертификатов
* @returns список сертификатов
*/
export declare const getContainerCertificates: (resetCache?: boolean) => Promise<Certificate[]>;
6 changes: 6 additions & 0 deletions dist/api/getCspVersion.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* Предоставляет информацию о системе
*
* @returns информацию о CSP
*/
export declare const getCspVersion: () => Promise<string>;
6 changes: 6 additions & 0 deletions dist/api/getPluginVersion.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* Предоставляет информацию о системе
*
* @returns информацию о плагине
*/
export declare const getPluginVersion: () => Promise<string>;
10 changes: 9 additions & 1 deletion dist/api/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
export * from './getCertificate';
export * from './getUserCertificates';
export * from './getAllUserCertificates';
export * from './getContainerCertificates';
export * from './getAllContainerCertificates';
export * from './getCertificates';
export * from './getAllCertificates';
export * from './getSystemInfo';
export * from './isValidSystemSetup';
export * from './createSignature';
export * from './createXMLSignature';
export * from './createDetachedSignature';
export * from './addDetachedSignature';
export * from './createAttachedSignature';
export * from './addAttachedSignature';
export * from './createHash';
export * from './certificate';
export * from './getCspVersion';
export * from './getPluginVersion';
4 changes: 4 additions & 0 deletions dist/constants/oids-dictionary.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ export declare const OIDS_DICTIONARY: {
'1.2.643.2.2.34.6': string;
'1.2.643.2.39.1.1': string;
'1.2.643.3.131.1.1': string;
'1.2.643.100.4': string;
'1.2.643.100.1': string;
'1.2.643.100.5': string;
'1.2.643.100.3': string;
'1.2.643.3.141.1.1': string;
'1.2.643.3.141.1.2': string;
'1.2.643.3.2.100.65.13.11': string;
Expand Down
7 changes: 7 additions & 0 deletions dist/crypto-pro-js.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Type definitions for crypto-pro-js 2.3.3
// Project: crypto-pro-js
// Definitions by: Artem Vasilev https://github.com/kernusr

export as namespace cryptoPro;

export * from './api';
Loading