Merge branch 'devel' into CB-4010-auth-methods-dont-update-when-switc…

…hing-drivers
dbeaver · Jan 10, 2024 · 0cb773a · 0cb773a
2 parents 0a5d4b1 + 5041312
commit 0cb773a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/...r/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataLOBReceiver.java b/...r/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/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java b/...e.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()
+                    );
                 }
             }
         };

diff --git a/...aver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java b/...aver.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");
             }
         }

diff --git a/...hentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx b/...hentication-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>
   );