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

Dev v1.4.9gm s #1

Open
wants to merge 116 commits into
base: dev-v1.4.9gm-s
Choose a base branch
from

Conversation

guijunchen
Copy link
Member

支持fabric-ca v1.4.9国密版
支持国密算法
支持生产国密证书
支持国密https

Yuta Namiki and others added 30 commits February 26, 2021 19:45
FABC-768 #done

The following page has description of defining environment variables,
which is better to markup as a code block.

Also, there is a code block with collapsed indents.

This patch fixes these markup issues.

https://hyperledger-fabric-ca.readthedocs.io/en/latest/users-guide.html#hsm

Change-Id: Ie4ff94f88c859a9d72b3b20d977096f8b9d15e48
Signed-off-by: Yuta Namiki <y-namiki@ak.jp.nec.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
This patchset updates multiarch script to publish images
with two digit version. This avoids changing the DockerImage tags
in SDK docker-compose files for each release.

Change-Id: If6a12cfecce3198f74bf1c1a909e1cbfc3673c44
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Added testcase to for panic handling that was
introduced in lib/server/idemix package

Change-Id: I9a377e14e1f9edafaffce649af9d74dd6e4bcc1f
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Fix TOC format in user's guide

Change-Id: Ife3f28deadad427449dcdc4a53a143e8b128253b
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Value for environment variable `FABRIC_CA_SERVER_COMPATIBILITY_MODE_V1_3`
would always be set to true, even if the environment variable was explicitly
set to another value (e.g. false).

If environment variable is not set, the default will be true. If a
value has been explicitly set using the env var, then the set will be used
and the default will be overridden.

Change-Id: Icf5b3d2d543731f72084771fb083a5af54a78ee1
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I06c41060d638e9737178c1b0d1fe71391cb682b8
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I6111ab529af7ac0341e586ba5a00e59fc546bd62
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I5d107566e1373917c44f80a2415a3367ba453d08
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I0593ff14b333f245421945fbc4a808f7b1bced79
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Remove images from Makefile and remove
references to fabric-ca sample from the
docs

Change-Id: I900beae06fc6ebea23319bb76d5d71c9b1bc7fb4
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I636a933d9ec47a6fe2d33068e386c19201d6057b
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I2e03d87652ffabfe46bf151111d58a2e76fd1f2f
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
FABC-794 #done

Change-Id: I168414ca2874592b6142c18ceaeeb63aa8d124e7
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Modified ci.properties to use Golang 1.11.5
which is sourced by the Docker build process

Change-Id: Ic41318dcf17e2c1c8311da5a039cf979f654d0ad
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
(cherry picked from commit 5ddb94e)
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Added middleware to HTTP router that will be used
to record metrics

Change-Id: Iee6d1540b81f681fb55a7e1abfa417018c3128e3
Signed-off-by: Saad Karim <skarim@us.ibm.com>
(cherry picked from commit 18c18b8)
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Added rate, error, and duration metrics for server
APIs

Change-Id: Ia7ec7860ac4b8b177d49f84e1290000b53a67813
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Vendor go-kit

Change-Id: I68cc96c75684af6307aeef8162aa2c331f303094
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Wired metrics for server APIs

Change-Id: I84cbf3c4c909215459607a243ebff06182850603
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Created an operations endpoint that will be used to
get metrics data and for health checks

Change-Id: I4d602833c3c16996b0c86495ded7a99e3c82224d
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Created the /healthz endpoint on the new Operations
Server that can be used to gauge the health of the CA
server. Endpoint returns an http 200 if the Operations
Server endpoint is available

Change-Id: Iaafb81fc694a9a7b9b5934bceb7c65a1a9094195
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Refactored some of the database code into 3 distinct
packages, each package is a databases the CA supports
(SQLite, MySQL, and PostgresSQL).

There was a lack of proper unit test regarding a lot of the
database logic. Unit tests added for all the 3 databases.

This restructing of the database code will be useful for adding
support for metrics.

Change-Id: Idd5ed1c802ac6ba35de76462cbbb0baf0222eceb
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Created DB Metric Options

Change-Id: I84248b82c91d472385e9995d34ad8895be1d87cd
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Wire DB metrics

Change-Id: Ic703930867db1138aaf2fbc5e8ecc6521ddb0a46
Signed-off-by: Saad Karim <skarim@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Update fabric-ca to Baseimage 0.4.15 for v1.4.1

Change-Id: I2bd5b2335a2138bc5933d6bed30922e8d12ac137
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
The docs currently state the --csr.hosts
takes a space-separated list but it should
actually be a comma-separate list.

Updated the help for the command flags and
regenerated the docs as well.

Also adding logic to trim spaces and
modified the function which checks SANs
to use built-in fields of
x509.Certificate.

FABC-831 #done

Change-Id: I41ebeeb98997fe5ad1672e62076214ad6a9d7c4a
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
This patch creates pipeline script(Jenkinsfile) for x and ci.properties
to provide the default values for each branch specific with global
shared library.

e2e tests (sdk-node, java-sdk and fabcar), unit, fvt tests run parallel
after the basic checks are passed. If the change is specific to doc,
Jenkins won't trigger the non docs build otherwise it will trigger basic checks,
docs build on the same node and run unit-test, fvt tests parallel on different nodes
and send the result back to the main job.

Code Coverage report and HTML report can be seen on the main job. View
the output on the Blue Ocean plugin for better results.

NOTE: Only ci.properties needs to be changed according to the new branch
requirements incase if you create a new branch from master.

Change-Id: I719d7bf008cbf15014d3a44d5ae8f7b93e937b6d
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
- added config to enable CORS
- added config to specify allowed
origins

FABC-408 #done

Change-Id: I70f48ba54084b4a0524dc853dbe978124074ded2
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
This patch fixes the minor issues observed in Jenkinsfile and
doc changes.

Change-Id: Id703ea09647e49cb48a804df6dd5bffcd994b610
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: Id6138fe9f8b2ab5d15aae34c6757a8535c76fbdb
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Change-Id: I6f07279eb588cca3f10d014b89fdaadae12d73ac
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
joe-alewine and others added 22 commits February 26, 2021 19:45
This operations/deployment guide material is meant to show
how the CA is used to register and enroll identities and
create MSPs

Signed-off-by: joe-alewine <Joe.Alewine@ibm.com>
(cherry picked from commit 3a1323d)
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: pama-ibm <pama@ibm.com>
(cherry picked from commit 5fda489)
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Redacts label and pin from bccsp initialization logs

Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com>
(cherry picked from commit fc84b4f)
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
…r#181) (hyperledger#182)

Not all uses of the NonceManager require/expect a separate
go thread to be spawned to sweep for expired nonces.

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Also bump baseimage to 0.4.21, although this has no impact for Fabric CA.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Add release notes v1.4.8.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Doc previously, and in error, listed users folders
in the org MSP section where none is needed thanks
to Node OUs

Signed-off-by: joe-alewine <Joe.Alewine@ibm.com>
(cherry picked from commit a07c3fe)
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
FABC-914

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Final updates to Makefile and release notes

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
…source

Signed-off-by: guijun chen <877020907@qq.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
Signed-off-by: 陈桂军 <chengj16@bngrp.com>
@SamYuan1990 SamYuan1990 changed the base branch from master to release-1.4 February 26, 2021 13:06
@davidkhala davidkhala self-requested a review February 26, 2021 13:09
@davidkhala
Copy link
Member

Assign me to review

@davidkhala davidkhala changed the base branch from release-1.4 to dev-v1.4.9gm-s February 26, 2021 15:36
@davidkhala
Copy link
Member

@guijunchen 很神奇,我这里一顿错误操作,居然可以force push到你那个branch上去了,桂军你可能需要重新force push一下,以满足DCO

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.