Merge pull request #132 from xusd320/zkAuthInfo

Add zookeeper auth supports
apache · Oct 21, 2019 · 551d9ad · 551d9ad
2 parents 2e22edf + 137b942
commit 551d9ad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/dubbo/src/registry/zookeeper.ts b/packages/dubbo/src/registry/zookeeper.ts
@@ -179,14 +179,18 @@ export class ZkRegistry extends Registry<IZkClientProps & IDubboRegistryProps> {
    * connect zookeeper
    */
   private _connect = (callback: (err: Error) => void) => {
-    const {url: register} = this._props;
+    const {url: register, zkAuthInfo} = this._props;
     //debug log
     log(`connecting zkserver ${register}`);
     //connect
     this._client = zookeeper.createClient(register, {
       retries: 10,
     });
 
+    if (zkAuthInfo && zkAuthInfo.scheme && zkAuthInfo.auth) {
+      this._client.addAuthInfo(zkAuthInfo.scheme, Buffer.from(zkAuthInfo.auth));
+    }
+
     //超时检测
     //node-zookeeper-client,有个bug，当连不上zk时会无限重连
     //手动做一个超时检测

diff --git a/packages/dubbo/src/types.ts b/packages/dubbo/src/types.ts
@@ -93,7 +93,7 @@ export interface IDubboProps {
 
 //magic, you should use typescript 2.8+
 export type TDubboService<T> = {
-  [k in keyof T]: T[k] extends ((dubbo: any) => infer R) ? R : any
+  [k in keyof T]: T[k] extends ((dubbo: any) => infer R) ? R : any;
 };
 
 export interface IDubboResult<T> {
@@ -111,7 +111,16 @@ export interface IDubboProvider {
   methods: {[methodName: string]: Function};
 }
 
+// zookeeper acl shemes must be one of [ 'world', 'ip', 'host', 'auth', 'digest' ]
+export type IZKAuthSchemes = 'world' | 'ip' | 'host' | 'auth' | 'digest';
+
+export interface IZKAuthInfo {
+  scheme: IZKAuthSchemes;
+  auth: string;
+}
+
 export interface IZkClientProps {
+  zkAuthInfo?: IZKAuthInfo;
   zkRoot?: string;
   url: string;
 }