From 51bbc59fe4e5c30ed39d4c0866c1bf7f2acce04e Mon Sep 17 00:00:00 2001
From: DenisSinelnikov <142215442+DenisSinelnikov@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:32:18 +0400
Subject: [PATCH 1/3] CB-4484. Rename error message for bruteforce protection
 (#2280)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../service/security/bruteforce/BruteForceUtils.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java
index 2c95adf10f..8be8e7f262 100644
--- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java
+++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java
@@ -53,7 +53,7 @@ public static void checkBruteforce(SMControllerConfiguration smConfig, List<User
                 log.error("User login is blocked due to exceeding the limit of incorrect password entry");
                 Duration lockDuration = Duration.ofSeconds(smConfig.getBlockLoginPeriod());
 
-                throw new SMException("User blocked for " +
+                throw new SMException("Blocked the possibility of login for this user for " +
                     lockDuration.minus(Duration.between(latestLogin.time(), now)).getSeconds() + " seconds");
             }
         }

From 8f66979dc49271877efeb380db3b69b353b544b6 Mon Sep 17 00:00:00 2001
From: DenisSinelnikov <142215442+DenisSinelnikov@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:33:46 +0400
Subject: [PATCH 2/3] CB-4377. Error text is more detailed to export large sql
 result (#2274)

* CB-4377. Error text is more detailed to export large sql result

* CB-4377. Error text is more detailed to export large sql result

* CB-4377. Fixed typo in error message

* CB-4377. Fixed typo in error message

---------

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java | 4 +++-
 .../service/data/transfer/impl/WebServiceDataTransfer.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java
index 03d48cec8f..f08bb05147 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java
@@ -86,7 +86,9 @@ public String createLobFile(DBCSession session) throws DBCException, IOException
         }
         if (binaryValue.length > fileSizeLimit.longValue()) {
             throw new DBQuotaException(
-                    "Data export quota exceeded", CBConstants.QUOTA_PROP_FILE_LIMIT, fileSizeLimit.longValue(), binaryValue.length);
+                    "Data export quota exceeded \n Please increase the resourceQuotas parameter in configuration",
+                CBConstants.QUOTA_PROP_FILE_LIMIT, fileSizeLimit.longValue(), binaryValue.length
+            );
         }
         Path file = DATA_EXPORT_FOLDER.resolve(exportFileName);
         Files.write(file, binaryValue);
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
index a352da4a3c..6581b19d54 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
@@ -215,7 +215,9 @@ public void fetchRow(DBCSession session, DBCResultSet resultSet) throws DBCExcep
                 super.fetchRow(session, resultSet);
                 if (fileSizeLimit != null && getBytesWritten() > fileSizeLimit.longValue()) {
                     throw new DBQuotaException(
-                        "Data export quota exceeded", QUOTA_PROP_FILE_LIMIT, fileSizeLimit.longValue(), getBytesWritten());
+                        "Data export quota exceeded \n Please increase the resourceQuotas parameter in configuration",
+                        QUOTA_PROP_FILE_LIMIT, fileSizeLimit.longValue(), getBytesWritten()
+                    );
                 }
             }
         };

From 50413126012ab7853a32e84883b8e1164580ebaa Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:37:10 +0100
Subject: [PATCH 3/3] CB-4442 add box styles to the form itself (#2277)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../AuthConfigurationForm.tsx                 | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx
index dceac83886..31d4b16486 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx
@@ -79,31 +79,29 @@ export const AuthConfigurationForm = observer<Props>(function AuthConfigurationF
   }, []);
 
   return (
-    <Form context={form}>
+    <Form context={form} className={s(styles, { box: true }, className)}>
       <TabsState actions={actions} container={service.tabsContainer} state={state} onCancel={onCancel}>
-        <div className={s(styles, { box: true }, className)}>
-          <div className={s(styles, { topBar: true })}>
-            <div className={s(styles, { topBarTabs: true })}>
-              <div className={s(styles, { statusMessage: true })}>
-                {state.statusMessage && (
-                  <>
-                    <IconOrImage className={s(styles, { iconOrImage: true })} icon="/icons/info_icon.svg" />
-                    {translate(state.statusMessage)}
-                  </>
-                )}
-              </div>
-              <TabList style={tabsInnerStyles} disabled={false} />
-            </div>
-            <div className={s(styles, { topBarActions: true })}>
-              <Loader suspense inline hideMessage hideException>
-                <Placeholder actions={actions} container={service.actionsContainer} state={state} onCancel={onCancel} />
-              </Loader>
+        <div className={s(styles, { topBar: true })}>
+          <div className={s(styles, { topBarTabs: true })}>
+            <div className={s(styles, { statusMessage: true })}>
+              {state.statusMessage && (
+                <>
+                  <IconOrImage className={s(styles, { iconOrImage: true })} icon="/icons/info_icon.svg" />
+                  {translate(state.statusMessage)}
+                </>
+              )}
             </div>
+            <TabList style={tabsInnerStyles} disabled={false} />
           </div>
-          <div className={s(styles, { contentBox: true })}>
-            <TabPanelList style={tabsInnerStyles} />
+          <div className={s(styles, { topBarActions: true })}>
+            <Loader suspense inline hideMessage hideException>
+              <Placeholder actions={actions} container={service.actionsContainer} state={state} onCancel={onCancel} />
+            </Loader>
           </div>
         </div>
+        <div className={s(styles, { contentBox: true })}>
+          <TabPanelList style={tabsInnerStyles} />
+        </div>
       </TabsState>
     </Form>
   );