Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 06:25:45 +01:00
Code Issues Packages Projects Releases Activity

Merged in bugfix/disable_repository_config (pull request #218)

Browse Source 
Bugfix: Disable repository config without permission
This commit is contained in:
Sebastian Sdorra
2019-03-14 10:48:06 +00:00
parent 7f54a13d49 6aec9a9d1f
commit aec702ff89
7 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitRepositoryConfigResource.java
View File

@@ -8,6 +8,7 @@ import sonia.scm.repository.GitRepositoryConfig;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryPermissions;
import sonia.scm.store.ConfigurationStore;
import sonia.scm.web.GitVndMediaType;
@@ -50,6 +51,7 @@ public class GitRepositoryConfigResource {
})
public Response getRepositoryConfig(@PathParam("namespace") String namespace, @PathParam("name") String name) {
Repository repository = getRepository(namespace, name);
RepositoryPermissions.read(repository).check();
ConfigurationStore<GitRepositoryConfig> repositoryConfigStore = getStore(repository);
GitRepositoryConfig config = repositoryConfigStore.get();
GitRepositoryConfigDto dto = repositoryConfigMapper.map(config, repository);
@@ -68,6 +70,7 @@ public class GitRepositoryConfigResource {
})
public Response setRepositoryConfig(@PathParam("namespace") String namespace, @PathParam("name") String name, GitRepositoryConfigDto dto) {
Repository repository = getRepository(namespace, name);
RepositoryPermissions.modify(repository).check();
ConfigurationStore<GitRepositoryConfig> repositoryConfigStore = getStore(repository);
GitRepositoryConfig config = repositoryConfigMapper.map(dto);
repositoryConfigStore.set(config);

27
scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.js
View File

@@ -18,7 +18,8 @@ type State = {
error?: Error,
branches: Branch[],
selectedBranchName?: string,
defaultBranchChanged: boolean
defaultBranchChanged: boolean,
disabled: boolean
};
const GIT_CONFIG_CONTENT_TYPE = "application/vnd.scmm-gitConfig+json";
@@ -33,7 +34,8 @@ class RepositoryConfig extends React.Component<Props, State> {
loadingDefaultBranch: true,
submitPending: false,
branches: [],
defaultBranchChanged: false
defaultBranchChanged: false,
disabled: true
};
}
@@ -53,11 +55,11 @@ class RepositoryConfig extends React.Component<Props, State> {
apiClient
.get(repository._links.configuration.href)
.then(response => response.json())
.then(payload => payload.defaultBranch)
.then(selectedBranchName =>
.then(payload =>
this.setState({
...this.state,
selectedBranchName,
selectedBranchName: payload.defaultBranch,
disabled: !payload._links.update,
loadingDefaultBranch: false
})
)
@@ -98,7 +100,7 @@ class RepositoryConfig extends React.Component<Props, State> {
render() {
const { t } = this.props;
const { loadingBranches, loadingDefaultBranch, submitPending, error } = this.state;
const { loadingBranches, loadingDefaultBranch, submitPending, error, disabled } = this.state;
if (error) {
return (
@@ -110,6 +112,12 @@ class RepositoryConfig extends React.Component<Props, State> {
);
}
const submitButton = disabled? null: <SubmitButton
label={t("scm-git-plugin.repo-config.submit")}
loading={submitPending}
disabled={!this.state.selectedBranchName}
/>;
if (!(loadingBranches || loadingDefaultBranch)) {
return (
<>
@@ -121,12 +129,9 @@ class RepositoryConfig extends React.Component<Props, State> {
branches={this.state.branches}
selected={this.branchSelected}
selectedBranch={this.state.selectedBranchName}
disabled={disabled}
/>
<SubmitButton
label={t("scm-git-plugin.repo-config.submit")}
loading={submitPending}
disabled={!this.state.selectedBranchName}
/>
{ submitButton }
</form>
<hr />
</>

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
View File

@@ -159,7 +159,7 @@ public class GitConfigResourceTest {
}
@Test
@SubjectAware(username = "writeOnly")
@SubjectAware(username = "readWrite")
public void shouldReadDefaultRepositoryConfig() throws URISyntaxException, UnsupportedEncodingException {
when(repositoryManager.get(new NamespaceAndName("space", "X"))).thenReturn(new Repository("id", "git", "space", "X"));
@@ -193,7 +193,7 @@ public class GitConfigResourceTest {
}
@Test
@SubjectAware(username = "writeOnly")
@SubjectAware(username = "readOnly")
public void shouldReadStoredRepositoryConfig() throws URISyntaxException, UnsupportedEncodingException {
when(repositoryManager.get(new NamespaceAndName("space", "X"))).thenReturn(new Repository("id", "git", "space", "X"));
GitRepositoryConfig gitRepositoryConfig = new GitRepositoryConfig();

2
scm-plugins/scm-git-plugin/src/test/resources/sonia/scm/configuration/shiro.ini
View File

@@ -7,7 +7,7 @@ admin = secret, admin
[roles]
reader = configuration:read:git
writer = configuration:write:git
readerWriter = configuration:*:git
readerWriter = configuration:*:git,repository:*:id
admin = *
repoRead = repository:read:*
repoWrite = repository:modify:*

4
scm-ui-components/packages/ui-components/src/BranchSelector.js
View File

@@ -26,6 +26,7 @@ type Props = {
selected: (branch?: Branch) => void,
selectedBranch?: string,
label: string,
disabled?: boolean,
// context props
classes: Object
@@ -47,7 +48,7 @@ class BranchSelector extends React.Component<Props, State> {
}
render() {
const { branches, classes, label } = this.props;
const { branches, classes, label, disabled } = this.props;
if (branches) {
return (
@@ -79,6 +80,7 @@ class BranchSelector extends React.Component<Props, State> {
className="is-fullwidth"
options={branches.map(b => b.name)}
optionSelected={this.branchSelected}
disabled={!!disabled}
preselectedOption={
this.state.selectedBranch
? this.state.selectedBranch.name

6
scm-ui-components/packages/ui-components/src/forms/Textarea.js
View File

@@ -14,7 +14,8 @@ type Props = {
value?: string,
autofocus?: boolean,
onChange: (value: string, name?: string) => void,
helpText?: string
helpText?: string,
disabled?: boolean
};
class Textarea extends React.Component<Props> {
@@ -31,7 +32,7 @@ class Textarea extends React.Component<Props> {
};
render() {
const { placeholder, value, label, helpText } = this.props;
const { placeholder, value, label, helpText, disabled } = this.props;
return (
<div className="field">
@@ -45,6 +46,7 @@ class Textarea extends React.Component<Props> {
placeholder={placeholder}
onChange={this.handleInput}
value={value}
disabled={!!disabled}
/>
</div>
</div>

25
scm-ui/src/repos/components/form/RepositoryForm.js
View File

@@ -71,7 +71,8 @@ class RepositoryForm extends React.Component<Props, State> {
this.state.nameValidationError ||
this.state.contactValidationError ||
this.isFalsy(repository.name) ||
(namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY && this.isFalsy(repository.namespace))
(namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY &&
this.isFalsy(repository.namespace))
);
};
@@ -86,10 +87,24 @@ class RepositoryForm extends React.Component<Props, State> {
return !this.props.repository;
};
isModifiable = () => {
return !!this.props.repository && !!this.props.repository._links.update;
};
render() {
const { loading, t } = this.props;
const repository = this.state.repository;
const disabled = !this.isModifiable() && !this.isCreateMode();
const submitButton = disabled ? null : (
<SubmitButton
disabled={!this.isValid()}
loading={loading}
label={t("repositoryForm.submit")}
/>
);
let subtitle = null;
if (this.props.repository) {
// edit existing repo
@@ -108,6 +123,7 @@ class RepositoryForm extends React.Component<Props, State> {
validationError={this.state.contactValidationError}
errorMessage={t("validation.contact-invalid")}
helpText={t("help.contactHelpText")}
disabled={disabled}
/>
<Textarea
@@ -115,12 +131,9 @@ class RepositoryForm extends React.Component<Props, State> {
onChange={this.handleDescriptionChange}
value={repository ? repository.description : ""}
helpText={t("help.descriptionHelpText")}
disabled={disabled}
/>
<SubmitButton
disabled={!this.isValid()}
loading={loading}
label={t("repositoryForm.submit")}
/>
{submitButton}
</form>
</>
);