From 8dbb6d30292a5e9f11b6a1bd523936b5e0bdd1bd Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Tue, 5 May 2020 00:24:22 +0300
Subject: [PATCH] Default configuration update

---
 samples/sample-databases/cloudbeaver.conf                   | 5 ++++-
 .../src/io/cloudbeaver/server/CBAppConfig.java              | 2 +-
 .../cloudbeaver/service/auth/impl/WebServiceAuthImpl.java   | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/samples/sample-databases/cloudbeaver.conf b/samples/sample-databases/cloudbeaver.conf
index 214532c5e3..df24f67116 100644
--- a/samples/sample-databases/cloudbeaver.conf
+++ b/samples/sample-databases/cloudbeaver.conf
@@ -20,6 +20,7 @@
             driver="h2_embedded",
             url: "jdbc:h2:${workspace}/.data/cb.h2.dat",
             // For embedded database it will be the primary user name/password
+            // IMPORTANT! To avoid security hole change this password before the first server start
             user: "cb-data",
             password: "cb-data",
 
@@ -39,8 +40,9 @@
     app: {
         anonymousAccessEnabled: true,
         anonymousUserRole: "user",
-        supportsCustomConnections: false,
+        supportsCustomConnections: false
 
+        /*
         enabledDrivers: [
             "postgresql:postgres-jdbc",
             "mysql:mysql8",
@@ -50,6 +52,7 @@
             "generic:h2_embedded",
             "jaybird:jaybird",
         ]
+        */
 
     }
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java
index 35dec6dc1c..bc601957f6 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java
@@ -17,7 +17,7 @@
 package io.cloudbeaver.server;
 
 /**
- * Database configuration
+ * Application configuration
  */
 public class CBAppConfig {
     private boolean anonymousAccessEnabled = true;
diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
index b38730e8d9..3e5c4e6148 100644
--- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
+++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
@@ -24,6 +24,7 @@ import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.user.WebUser;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.registry.WebServiceRegistry;
+import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
 import io.cloudbeaver.service.auth.DBWServiceAuth;
 import io.cloudbeaver.service.auth.WebAuthInfo;
@@ -42,6 +43,9 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
 
     @Override
     public WebAuthInfo authLogin(WebSession webSession, String providerId, Map<String, Object> authParameters) throws DBWebException {
+        if (!CBApplication.getInstance().getAppConfiguration().isAuthenticationEnabled()) {
+            throw new DBWebException("Authentication was disabled for this server");
+        }
         if (CommonUtils.isEmpty(providerId)) {
             throw new DBWebException("Missing auth provider parameter");
         }
@@ -85,7 +89,7 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
             authInfo.setLoginTime(OffsetDateTime.now());
             authInfo.setAuthProvider(authProvider.getId());
             authInfo.setAuthToken(authToken);
-            authInfo.setMessage("Logged using " + authProvider.getLabel() + " provider");
+            authInfo.setMessage("Authenticated with " + authProvider.getLabel() + " provider");
 
             if (user == null) {
                 user = new WebUser(userId);