-
Notifications
You must be signed in to change notification settings - Fork 392
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'devel' into CB-3952-navigator-forbidden-symbols-can-be-…
…used-for-rename-folder
- Loading branch information
Showing
48 changed files
with
642 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMBruteForceProtected.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2023 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.cloudbeaver.auth; | ||
|
|
||
| import org.jkiss.code.NotNull; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public interface SMBruteForceProtected { | ||
| Object getInputUsername(@NotNull Map<String, Object> cred); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_15.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ALTER TABLE {table_prefix}CB_AUTH_ATTEMPT | ||
| ADD COLUMN AUTH_USERNAME VARCHAR(128) NULL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...aver.service.security/src/io/cloudbeaver/service/security/bruteforce/BruteForceUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * DBeaver - Universal Database Manager | ||
| * Copyright (C) 2010-2023 DBeaver Corp and others | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.cloudbeaver.service.security.bruteforce; | ||
|
|
||
| import io.cloudbeaver.service.security.SMControllerConfiguration; | ||
| import org.jkiss.dbeaver.DBException; | ||
| import org.jkiss.dbeaver.Log; | ||
| import org.jkiss.dbeaver.model.auth.SMAuthStatus; | ||
| import org.jkiss.dbeaver.model.security.exception.SMException; | ||
|
|
||
| import java.time.Duration; | ||
| import java.time.LocalDateTime; | ||
| import java.util.List; | ||
|
|
||
| public class BruteForceUtils { | ||
|
|
||
| private static final Log log = Log.getLog(BruteForceUtils.class); | ||
|
|
||
| public static void checkBruteforce(SMControllerConfiguration smConfig, List<UserLoginRecord> latestLogins) throws DBException { | ||
| if (latestLogins.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| var latestLogin = latestLogins.get(0); | ||
| checkLoginInterval(latestLogin.time(), smConfig.getMinimumLoginTimeout()); | ||
|
|
||
| long errorsCount = latestLogins.stream() | ||
| .filter(authAttemptSessionInfo -> authAttemptSessionInfo.smAuthStatus() == SMAuthStatus.ERROR).count(); | ||
|
|
||
| boolean shouldBlock = errorsCount >= smConfig.getMaxFailedLogin(); | ||
| if (shouldBlock) { | ||
| int blockPeriod = smConfig.getBlockLoginPeriod(); | ||
| LocalDateTime unblockTime = latestLogin.time().plusSeconds(blockPeriod); | ||
|
|
||
| LocalDateTime now = LocalDateTime.now(); | ||
| shouldBlock = unblockTime.isAfter(now); | ||
|
|
||
| if (shouldBlock) { | ||
| 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 " + | ||
| lockDuration.minus(Duration.between(latestLogin.time(), now)).getSeconds() + " seconds"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static void checkLoginInterval(LocalDateTime createTime, int timeout) throws DBException { | ||
| if (createTime != null && Duration.between(createTime, LocalDateTime.now()).getSeconds() < timeout) { | ||
| throw new DBException("You are trying to log in too fast"); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.