CA Management: add generateCRL function. blockchain-desktop#202

Signed-off-by: Yi DENG <[email protected]>

fabric/v1.1/fabcar/.gitignore

@@ -0,0 +1 @@
+hfc-key-store

fabric/v1.1/fabcar/desktopConfigCAAdmin.yaml

@@ -0,0 +1,8 @@
+peerGrpcUrl: grpc://localhost:7051
+peerEventUrl: grpc://localhost:7053
+ordererUrl: grpc://localhost:7050
+mspId: Org1MSP
+# 私钥和证书，每次需手动执行node enrollAdmin.js生成，并手动hfc-key-store/admin复制出证书创建新文件，并修改私钥对应的文件
+certificate: hfc-key-store/admin.crt
+privateKey: hfc-key-store/474b19c5aff786e6db33b89b94c8daa6b3336183e843c1e58630450c53f5bd96-priv
+caServerUrl: http://localhost:7054

src/common/common.js

@@ -81,6 +81,9 @@ Common.REVOKE_USERNAME = 'User ID';
 Common.REVOKE_OPTIONAL = 'Optional';
 Common.REVOKE_CONFIRM = 'Revoke';
 
+Common.GENERATE_CRL = 'GENERATE CERTIFICATE REVOKE LIST--CRL';
+Common.GENERATE_CRL_OPTIONAL = 'Optional';
+Common.GENERATE_CRL_CONFIRM = 'Get';
 
 Common.WARN = {
   chaincodeName: 'chaincode name can not be null!',

src/common/common_cn.js

@@ -79,6 +79,9 @@ Common.REVOKE_USERNAME = '用户ID';
 Common.REVOKE_OPTIONAL = '其他参数';
 Common.REVOKE_CONFIRM = '吊销';
 
+Common.GENERATE_CRL = '证书吊销列表(CRL)获取';
+Common.GENERATE_CRL_OPTIONAL = '其他参数';
+Common.GENERATE_CRL_CONFIRM = '获取';
 
 Common.WARN = {
   chaincodeName: '链码名称不能为空!',

src/components/content/CAUpdateContent.jsx

@@ -20,13 +20,18 @@ export default class CAUpdateContent extends React.Component {
       revokeUserName: '',
       revokeOptional: '',
       revokeResult: '',
+
+      generateCrlOptional: '',
+      generateCrlResult: '',
     };
 
     this.onChangeReenrollOptional = this.onChangeReenrollOptional.bind(this);
     this.onChangeRevokeUserName = this.onChangeRevokeUserName.bind(this);
     this.onChangeRevokeOptional = this.onChangeRevokeOptional.bind(this);
+    this.onChangeRevokeOptional = this.onChangeRevokeOptional.bind(this);
     this.handleReenroll = this.handleReenroll.bind(this);
     this.handleRevoke = this.handleRevoke.bind(this);
+    this.handleGenerateCrl = this.handleGenerateCrl.bind(this);
   }
 
   onChangeReenrollOptional(event) {
@@ -38,6 +43,9 @@ export default class CAUpdateContent extends React.Component {
   onChangeRevokeOptional(event) {
     this.setState({ revokeOptional: event.target.value });
   }
+  onChangeGenerateCrlOptional(event) {
+    this.setState({ generateCrlOptional: event.target.value });
+  }
 
   handleReenroll() {
     let req = null;
@@ -80,14 +88,37 @@ export default class CAUpdateContent extends React.Component {
       })
       .then((result) => {
         logger.debug('revoke successfully, result: ', result);
-        self.setState({ revokeResult: result.toString() });
+        self.setState({ revokeResult: 'success' });
       })
       .catch((err) => {
         self.setState({ revokeResult: 'Revocation fails.' });
         logger.debug(err);
       });
   }
 
+  handleGenerateCrl() {
+    let req = null;
+    if (this.state.enrollOptional) {
+      req = JSON.parse(this.state.enrollOptional);
+    }
+
+    const self = this;
+
+    getFabricClientSingleton()
+      .then((client) => {
+        logger.debug('start to generateCRL, request: ', req);
+        return client.generateCRL(req);
+      })
+      .then((result) => {
+        logger.debug('crlResult: ', result);
+        self.setState({ generateCrlResult: result.toString() });
+      })
+      .catch((err) => {
+        self.setState({ generateCrlResult: 'Fail.' });
+        logger.debug(err);
+      });
+  }
+
   render() {
     const outerDivStyle = {
       padding: '24px',
@@ -192,7 +223,20 @@ export default class CAUpdateContent extends React.Component {
           />
         </div>
 
-        {/*TODO: 实现generateCRL */}
+        <div>{this.state.Common.GENERATE_CRL}</div>
+        <div style={DivStyle}>
+          <span style={spanStyle}>{this.state.Common.GENERATE_CRL_OPTIONAL}</span>
+          <Input placeholder="Optional json parameters" style={configInputStyle} value={this.state.generateCrlOptional} onChange={this.onChangeGenerateCrlOptional} />
+        </div>
+        <div style={DivStyle}>
+          <Button style={ButtonStyle} type="primary" onClick={this.handleGenerateCrl}>{this.state.Common.GENERATE_CRL_CONFIRM}</Button>
+          <TextArea
+            placeholder="GenerateCRL Result"
+            value={this.state.generateCrlResult}
+            autosize={{ minRows: 2, maxRows: 2 }}
+            readOnly
+          />
+        </div>
       </div>
 
     );

src/util/fabric.js

@@ -826,6 +826,9 @@ class FabricClient {
    * @returns {Promise<any>}
    */
   generateCRL(req) {
+    if (!req) {
+      req = {};
+    }
     return this.fabricCAClient.generateCRL(req, this.user);
   }