fix(connections): support TLS/SSL one-way authentication(#133)

emqx · Jan 3, 2020 · 643cf03 · 643cf03
1 parent 141bfd7
commit 643cf03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/utils/getFiles.ts b/src/utils/getFiles.ts
@@ -2,19 +2,12 @@ import fs from 'fs'
 import path from 'path'
 import { SSLPath, SSLContent } from '@/views/connections/types'
 
-export const getCAFile = () => {
-  // igonre
-}
-
 export const getSSLFile = (sslPath: SSLPath): SSLContent | undefined => {
   const { ca, cert, key } = sslPath
-  if (ca === '' && cert === '' && key === '') {
-    return undefined
-  }
   const res: SSLContent = {
-    ca: fs.readFileSync(path.join(ca), 'utf-8'),
-    cert: fs.readFileSync(path.join(cert), 'utf-8'),
-    key: fs.readFileSync(path.join(key), 'utf-8'),
+    ca: ca !== '' ? [fs.readFileSync(path.join(ca), 'utf-8')] : undefined,
+    cert: cert !== '' ? fs.readFileSync(path.join(cert), 'utf-8') : undefined,
+    key: key !== '' ? fs.readFileSync(path.join(key), 'utf-8') : undefined,
   }
   return res
 }

diff --git a/src/views/connections/ConnectionForm.vue b/src/views/connections/ConnectionForm.vue
@@ -78,7 +78,7 @@
               <el-col :span="22">
                 <el-form-item label-width="93px" :label="$t('connections.certType')" prop="certType">
                   <el-radio-group v-model="record.certType">
-                    <el-radio label="ca">CA signed server</el-radio>
+                    <el-radio label="server">CA signed server</el-radio>
                     <el-radio label="self">Self signed</el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -259,8 +259,6 @@ export default class ConnectionCreate extends Vue {
       port: [{ required: true, message: this.$t('common.inputRequired') }],
       certType: [{ required: true, message: this.$t('common.selectRequired') }],
       ca: [{ required: true, message: this.$t('common.inputRequired') }],
-      cert: [{ required: true, message: this.$t('common.inputRequired') }],
-      key: [{ required: true, message: this.$t('common.inputRequired') }],
     }
   }
 

diff --git a/src/views/connections/types.ts b/src/views/connections/types.ts
@@ -28,7 +28,7 @@ export interface ConnectionModel extends SSLPath  {
   username: string,
   password: string,
   path: string,
-  certType?: '' | 'ca' | 'self',
+  certType?: '' | 'server' | 'self',
   ssl: boolean,
   mqttVersion: '3.1.1' | '5.0',
   unreadMessageCount: number,