[Code] enable ssh protocol, only read ssh key pairs from data folder.

x-pack/package.json

@@ -163,7 +163,7 @@
     "@elastic/javascript-typescript-langserver": "^0.1.21",
     "@elastic/lsp-extension": "^0.1.1",
     "@elastic/node-crypto": "0.1.2",
-    "@elastic/nodegit": "0.25.0-alpha.11",
+    "@elastic/nodegit": "0.25.0-alpha.12",
     "@elastic/numeral": "2.3.2",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/es-query": "1.0.0",

x-pack/plugins/code/common/repository_utils.test.ts

@@ -15,6 +15,7 @@ test('Repository url parsing', () => {
     url: 'https://github.com/apache/sqoop',
     name: 'sqoop',
     org: 'apache',
+    protocol: 'https',
   });
 
   // Valid git url with .git suffix.
@@ -23,6 +24,7 @@ test('Repository url parsing', () => {
     uri: 'github.com/apache/sqoop',
     url: 'https://github.com/apache/sqoop.git',
     name: 'sqoop',
+    protocol: 'https',
     org: 'apache',
   });
 
@@ -39,6 +41,7 @@ test('Repository url parsing', () => {
     url: 'git://a/b',
     name: 'b',
     org: '_',
+    protocol: 'git',
   });
 
   const repo5 = RepositoryUtils.buildRepository('git://a/b/c');
@@ -47,13 +50,15 @@ test('Repository url parsing', () => {
     url: 'git://a/b/c',
     name: 'c',
     org: 'b',
+    protocol: 'git',
   });
 
   const repo6 = RepositoryUtils.buildRepository('[email protected]:foo/bar.git');
   expect(repo6).toEqual({
     uri: 'github.com/foo/bar',
     url: '[email protected]:foo/bar.git',
     name: 'bar',
+    protocol: 'ssh',
     org: 'foo',
   });
 
@@ -63,6 +68,7 @@ test('Repository url parsing', () => {
     url: 'ssh://[email protected]:foo/bar.git',
     name: 'bar',
     org: 'foo',
+    protocol: 'ssh',
   });
 });
 
@@ -73,6 +79,7 @@ test('Repository url parsing with non standard segments', () => {
     url: 'git://a/b/c/d',
     name: 'd',
     org: 'b_c',
+    protocol: 'git',
   });
 
   const repo2 = RepositoryUtils.buildRepository('git://a/b/c/d/e');
@@ -81,13 +88,15 @@ test('Repository url parsing with non standard segments', () => {
     url: 'git://a/b/c/d/e',
     name: 'e',
     org: 'b_c_d',
+    protocol: 'git',
   });
 
   const repo3 = RepositoryUtils.buildRepository('git://a');
   expect(repo3).toEqual({
     uri: 'a/_/_',
     url: 'git://a',
     name: '_',
+    protocol: 'git',
     org: '_',
   });
 });
@@ -99,6 +108,7 @@ test('Repository url parsing with port', () => {
     url: 'ssh://[email protected]:27017/gitolite-admin',
     name: 'gitolite-admin',
     org: 'mine',
+    protocol: 'ssh',
   });
 
   const repo2 = RepositoryUtils.buildRepository(
@@ -108,6 +118,7 @@ test('Repository url parsing with port', () => {
     uri: 'mydomain.com:27017/elastic/gitolite-admin',
     url: 'ssh://[email protected]:27017/elastic/gitolite-admin',
     name: 'gitolite-admin',
+    protocol: 'ssh',
     org: 'elastic',
   });
 });

x-pack/plugins/code/common/repository_utils.ts

@@ -28,6 +28,7 @@ export class RepositoryUtils {
       url: repo.href as string,
       name,
       org,
+      protocol: repo.protocol,
     };
   }
 

x-pack/plugins/code/model/repository.ts

@@ -17,6 +17,7 @@ export interface Repository {
   org?: string;
   defaultBranch?: string;
   revision?: string;
+  protocol?: string;
   // The timestamp of next update for this repository.
   nextUpdateTimestamp?: Date;
   // The timestamp of next index for this repository.

x-pack/plugins/code/server/__tests__/repository_service.ts

@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import assert from 'assert';
+// import { generateKeyPairSync } from 'crypto';
+import fs from 'fs';
+import * as os from 'os';
+import path from 'path';
+import rimraf from 'rimraf';
+import { RepositoryUtils } from '../../common/repository_utils';
+import { RepositoryService } from '../repository_service';
+import { ConsoleLogger } from '../utils/console_logger';
+
+describe('repository service test', () => {
+  const log = new ConsoleLogger();
+  const baseDir = fs.mkdtempSync(path.join(os.tmpdir(), 'code_test'));
+  log.debug(baseDir);
+  const repoDir = path.join(baseDir, 'repo');
+  const credsDir = path.join(baseDir, 'credentials');
+  // @ts-ignore
+  before(() => {
+    fs.mkdirSync(credsDir);
+    fs.mkdirSync(repoDir);
+  });
+  // @ts-ignore
+  after(() => {
+    return rimraf.sync(baseDir);
+  });
+  const service = new RepositoryService(repoDir, credsDir, log);
+
+  it('can not clone a repo by ssh without a key', async () => {
+    const repo = RepositoryUtils.buildRepository(
+      '[email protected]:elastic/TypeScript-Node-Starter.git'
+    );
+    await assert.rejects(service.clone(repo));
+    // @ts-ignore
+  }).timeout(60000);
+
+  /*it('can clone a repo by ssh with a key', async () => {
+
+    const repo = RepositoryUtils.buildRepository('[email protected]:elastic/code.git');
+     const { publicKey, privateKey } = generateKeyPairSync('rsa', {
+      modulusLength: 4096,
+      publicKeyEncoding: {
+        type: 'pkcs1',
+        format: 'pem',
+      },
+      privateKeyEncoding: {
+        type: 'pkcs1',
+        format: 'pem',
+      },
+    });
+    fs.writeFileSync(path.join(credsDir, 'id_rsa.pub'), publicKey);
+    fs.writeFileSync(path.join(credsDir, 'id_rsa'), privateKey);
+    const result = await service.clone(repo);
+    assert.ok(fs.existsSync(path.join(repoDir, result.repo.uri)));
+  }).timeout(60000); */
+});

x-pack/plugins/code/server/queue/clone_worker.ts

@@ -54,7 +54,11 @@ export class CloneWorker extends AbstractGitWorker {
     }
 
     this.log.info(`Execute clone job for ${url}`);
-    const repoService = this.repoServiceFactory.newInstance(this.serverOptions.repoPath, this.log);
+    const repoService = this.repoServiceFactory.newInstance(
+      this.serverOptions.repoPath,
+      this.serverOptions.credsPath,
+      this.log
+    );
     const repo = RepositoryUtils.buildRepository(url);
     return await repoService.clone(repo, (progress: number, cloneProgress?: CloneProgress) => {
       this.updateProgress(repo.uri, progress, cloneProgress);

x-pack/plugins/code/server/queue/delete_worker.ts

@@ -44,7 +44,11 @@ export class DeleteWorker extends AbstractWorker {
     this.cancellationService.cancelIndexJob(uri);
 
     // 2. Delete repository on local fs.
-    const repoService = this.repoServiceFactory.newInstance(this.serverOptions.repoPath, this.log);
+    const repoService = this.repoServiceFactory.newInstance(
+      this.serverOptions.repoPath,
+      this.serverOptions.credsPath,
+      this.log
+    );
     const deleteRepoPromise = this.deletePromiseWrapper(repoService.remove(uri), 'git data', uri);
 
     // 3. Delete ES indices and aliases

x-pack/plugins/code/server/queue/update_worker.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CloneWorkerResult } from '../../model';
+import { CloneWorkerResult, Repository } from '../../model';
 import { EsClient, Esqueue } from '../lib/esqueue';
 import { Logger } from '../log';
 import { RepositoryServiceFactory } from '../repository_service_factory';
@@ -26,10 +26,14 @@ export class UpdateWorker extends AbstractGitWorker {
   }
 
   public async executeJob(job: Job) {
-    const { uri } = job.payload;
-    this.log.info(`Execute update job for ${uri}`);
-    const repoService = this.repoServiceFactory.newInstance(this.serverOptions.repoPath, this.log);
-    return await repoService.update(uri);
+    const repo: Repository = job.payload;
+    this.log.info(`Execute update job for ${repo.uri}`);
+    const repoService = this.repoServiceFactory.newInstance(
+      this.serverOptions.repoPath,
+      this.serverOptions.credsPath,
+      this.log
+    );
+    return await repoService.update(repo);
   }
 
   public async onJobCompleted(job: Job, res: CloneWorkerResult) {