Throw error if repo is created with not supported type (#2019)

Throw error if repository is created with not supported type. Currently we only allow git, svn or hg all lowercase.
This commit is contained in:
Eduard Heimbuch
2022-05-03 16:06:38 +02:00
committed by GitHub
parent c05ddf7376
commit 77046bb6fd
7 changed files with 74 additions and 1 deletions

View File

@@ -0,0 +1,2 @@
- type: fixed
description: Validate repository types on creation ([#2019](https://github.com/scm-manager/scm-manager/pull/2019))

View File

@@ -61,7 +61,7 @@ public class RepositoryTypeConstraintValidator implements ConstraintValidator<Re
private boolean isSupportedType(String type) {
return repositoryManager.getConfiguredTypes()
.stream().anyMatch(t -> t.getName().equalsIgnoreCase(type));
.stream().anyMatch(t -> t.getName().equals(type));
}
private String createMessage(ConstraintValidatorContext context) {

View File

@@ -148,6 +148,9 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
}
public Repository create(Repository repository, Consumer<Repository> afterCreation, boolean initRepository) {
if (!isSupportedType(repository.getType())) {
throw InvalidRepositoryTypeException.create(repository);
}
repository.setId(keyGenerator.createKey());
repository.setNamespace(namespaceStrategyProvider.get().createNamespace(repository));
@@ -181,6 +184,11 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
);
}
private boolean isSupportedType(String type) {
return getConfiguredTypes()
.stream().anyMatch(t -> t.getName().equals(type));
}
private void invalidateRepositoryPermissions() {
ScmEventBus.getInstance().post(AuthorizationChangedEvent.createForEveryUser());
}
@@ -209,6 +217,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
@Override
public void init(SCMContextProvider context) {
// Do nothing
}
@Override

View File

@@ -0,0 +1,48 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import sonia.scm.ContextEntry;
import sonia.scm.ExceptionWithContext;
import java.util.List;
public class InvalidRepositoryTypeException extends ExceptionWithContext {
private static final String CODE = "8OT4gBVvp1";
public static InvalidRepositoryTypeException create(Repository repository) {
return new InvalidRepositoryTypeException(ContextEntry.ContextBuilder.entity(repository).build());
}
private InvalidRepositoryTypeException(List<ContextEntry> context) {
super(context, "The repository type is not supported");
}
@Override
public String getCode() {
return CODE;
}
}

View File

@@ -398,6 +398,10 @@
"52SqQBdpO1": {
"displayName": "Fehlender params Parameter",
"description": "Die Antwort der Authentifizierung enthält keinen params Parameter."
},
"8OT4gBVvp1": {
"displayName": "Repository Typ ungültig",
"description": "Dieser Repository Typ wird nicht unterstützt."
}
},
"healthCheckFailures": {

View File

@@ -406,6 +406,10 @@
"52SqQBdpO1": {
"displayName": "Params missing",
"description": "The parameter params is missing."
},
"8OT4gBVvp1": {
"displayName": "Repository type invalid",
"description": "The repository type is not supported."
}
},
"healthChecksFailures": {

View File

@@ -136,6 +136,12 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
assertRepositoriesEquals(dbRepo, heartOfGold);
}
@Test
public void shouldThrowInvalidTypeExceptionOnCreate() {
Repository testRepo = RepositoryTestData.create42Puzzle("test_type");
assertThrows(InvalidRepositoryTypeException.class, () -> manager.create(testRepo));
}
@SubjectAware(
username = "unpriv"
)