Implement HTTP Authentication provider and allow ApiKey authenticat…

…ion by default. (#58126)
elastic · Feb 28, 2020 · 90099f8 · 90099f8
1 parent 8077d34
commit 90099f8
Show file tree

Hide file tree

Showing 36 changed files with 2,749 additions and 2,541 deletions.
diff --git a/x-pack/legacy/plugins/security/index.js b/x-pack/legacy/plugins/security/index.js
@@ -138,11 +138,6 @@ export const security = kibana =>
       const xpackInfo = server.plugins.xpack_main.info;
       securityPlugin.__legacyCompat.registerLegacyAPI({
         auditLogger: new AuditLogger(server, 'security', config, xpackInfo),
-        serverConfig: {
-          protocol: server.info.protocol,
-          hostname: config.get('server.host'),
-          port: config.get('server.port'),
-        },
       });
 
       // Legacy xPack Info endpoint returns whatever we return in a callback for `registerLicenseCheckResultsGenerator`

diff --git a/x-pack/plugins/case/server/routes/api/__fixtures__/authc_mock.ts b/x-pack/plugins/case/server/routes/api/__fixtures__/authc_mock.ts
@@ -3,33 +3,22 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { Authentication } from '../../../../../security/server';
+import { AuthenticatedUser } from '../../../../../security/server';
+import { securityMock } from '../../../../../security/server/mocks';
 
-const getCurrentUser = jest.fn().mockReturnValue({
-  username: 'awesome',
-  full_name: 'Awesome D00d',
-});
-const getCurrentUserThrow = jest.fn().mockImplementation(() => {
-  throw new Error('Bad User - the user is not authenticated');
-});
+function createAuthenticationMock({
+  currentUser,
+}: { currentUser?: AuthenticatedUser | null } = {}) {
+  const { authc } = securityMock.createSetup();
+  authc.getCurrentUser.mockReturnValue(
+    currentUser !== undefined
+      ? currentUser
+      : ({ username: 'awesome', full_name: 'Awesome D00d' } as AuthenticatedUser)
+  );
+  return authc;
+}
 
 export const authenticationMock = {
-  create: (): jest.Mocked<Authentication> => ({
-    login: jest.fn(),
-    createAPIKey: jest.fn(),
-    getCurrentUser,
-    invalidateAPIKey: jest.fn(),
-    isAuthenticated: jest.fn(),
-    logout: jest.fn(),
-    getSessionInfo: jest.fn(),
-  }),
-  createInvalid: (): jest.Mocked<Authentication> => ({
-    login: jest.fn(),
-    createAPIKey: jest.fn(),
-    getCurrentUser: getCurrentUserThrow,
-    invalidateAPIKey: jest.fn(),
-    isAuthenticated: jest.fn(),
-    logout: jest.fn(),
-    getSessionInfo: jest.fn(),
-  }),
+  create: () => createAuthenticationMock(),
+  createInvalid: () => createAuthenticationMock({ currentUser: null }),
 };
diff --git a/x-pack/plugins/case/server/services/index.ts b/x-pack/plugins/case/server/services/index.ts
@@ -149,14 +149,8 @@ export class CaseService {
       }
     },
     getUser: async ({ request, response }: GetUserArgs) => {
-      let user;
-      try {
-        this.log.debug(`Attempting to authenticate a user`);
-        user = await authentication!.getCurrentUser(request);
-      } catch (error) {
-        this.log.debug(`Error on GET user: ${error}`);
-        throw error;
-      }
+      this.log.debug(`Attempting to authenticate a user`);
+      const user = authentication!.getCurrentUser(request);
       if (!user) {
         this.log.debug(`Error on GET user: Bad User`);
         throw new Error('Bad User - the user is not authenticated');