Merge branch 'develop' into feature/user_converter

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Generation of email addresses for users, where none is configured ([#1370](https://github.com/scm-manager/scm-manager/pull/1370))
 - Automatic user converter for external users ([#1380](https://github.com/scm-manager/scm-manager/pull/1380))
+- Source code fullscreen view ([#1376](https://github.com/scm-manager/scm-manager/pull/1376))
+
+## [2.6.3] - 2020-10-16
+### Fixed
+- Missing default permission to manage public gpg keys ([#1377](https://github.com/scm-manager/scm-manager/pull/1377))
 
 ## [2.7.1] - 2020-10-14
 ### Fixed
@@ -363,3 +368,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.6.0]: https://www.scm-manager.org/download/2.6.0
 [2.6.1]: https://www.scm-manager.org/download/2.6.1
 [2.6.2]: https://www.scm-manager.org/download/2.6.2
+[2.6.3]: https://www.scm-manager.org/download/2.6.3
+[2.7.0]: https://www.scm-manager.org/download/2.7.0
+[2.7.1]: https://www.scm-manager.org/download/2.7.1

Jenkinsfile

@@ -7,7 +7,8 @@ import com.cloudogu.ces.cesbuildlib.*
 
 node('docker') {
 
-  mainBranch = 'develop'
+  developmentBranch = 'develop'
+  mainBranch = 'master'
 
   properties([
     // Keep only the last 10 build to preserve space
@@ -51,9 +52,9 @@ node('docker') {
           sh "git config 'remote.origin.fetch' '+refs/heads/*:refs/remotes/origin/*'"
           sh "git fetch --all"
 
-          // merge release branch into master
-          sh "git checkout master"
-          sh "git reset --hard origin/master"
+          // merge release branch into main branch
+          sh "git checkout ${mainBranch}"
+          sh "git reset --hard origin/${mainBranch}"
           sh "git merge --ff-only ${env.BRANCH_NAME}"
 
           // set tag
@@ -87,7 +88,7 @@ node('docker') {
         sonarQube.analyzeWith(mvn)
       }
 
-      if (isBuildSuccessful() && (isMainBranch() || isReleaseBranch())) {
+      if (isBuildSuccessful() && (isDevelopmentBranch() || isReleaseBranch())) {
         def commitHash = git.getCommitHash()
 
         def imageVersion = mvn.getVersion()
@@ -143,20 +144,28 @@ node('docker') {
         }
 
         stage('Presentation Environment') {
+          // we don't use developmentBranch, because we only want the lastest version of develop branch on
+          // next-scm. We don't want a support branch or something similar on the presentation environment.
+          if ("develop".equals(env.BRANCH_NAME)) {
             build job: 'scm-manager/next-scm.cloudogu.com', propagate: false, wait: false, parameters: [
               string(name: 'changeset', value: commitHash),
               string(name: 'imageTag', value: imageVersion)
             ]
           }
+        }
 
         if (isReleaseBranch()) {
           stage('Update Repository') {
 
             // merge changes into develop
-            sh "git checkout develop"
+            sh "git checkout ${developmentBranch}"
+
             // TODO what if we have a conflict
             // e.g.: someone has edited the changelog during the release
-            sh "git merge master"
+            if (!developmentBranch.equals(mainBranch)) {
+              sh "git merge ${mainBranch}"
+            }
+
 
             // set versions for maven packages
             mvn "build-helper:parse-version versions:set -DgenerateBackupPoms=false -DnewVersion='\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.0-SNAPSHOT'"
@@ -176,8 +185,10 @@ node('docker') {
 
             // push changes back to remote repository
             withCredentials([usernamePassword(credentialsId: 'cesmarvin-github', usernameVariable: 'GIT_AUTH_USR', passwordVariable: 'GIT_AUTH_PSW')]) {
-              sh "git -c credential.helper=\"!f() { echo username='\$GIT_AUTH_USR'; echo password='\$GIT_AUTH_PSW'; }; f\" push origin master --tags"
+              sh "git -c credential.helper=\"!f() { echo username='\$GIT_AUTH_USR'; echo password='\$GIT_AUTH_PSW'; }; f\" push origin ${mainBranch} --tags"
+              if (!developmentBranch.equals(mainBranch)) {
                 sh "git -c credential.helper=\"!f() { echo username='\$GIT_AUTH_USR'; echo password='\$GIT_AUTH_PSW'; }; f\" push origin develop --tags"
+              }
               sh "git -c credential.helper=\"!f() { echo username='\$GIT_AUTH_USR'; echo password='\$GIT_AUTH_PSW'; }; f\" push origin :${env.BRANCH_NAME}"
             }
           }
@@ -189,6 +200,7 @@ node('docker') {
   }
 }
 
+String developmentBranch
 String mainBranch
 
 Maven setupMavenBuild() {
@@ -201,7 +213,7 @@ Maven setupMavenBuild() {
   mvn.additionalArgs += " -Dscm-it.logbackConfiguration=${logConf}"
   mvn.additionalArgs += " -Dsonar.coverage.exclusions=**/*.test.ts,**/*.test.tsx,**/*.stories.tsx"
 
-  if (isMainBranch() || isReleaseBranch()) {
+  if (isDevelopmentBranch() || isReleaseBranch()) {
     // Release starts javadoc, which takes very long, so do only for certain branches
     mvn.additionalArgs += ' -DperformRelease'
     // JDK8 is more strict, we should fix this before the next release. Right now, this is just not the focus, yet.
@@ -218,8 +230,8 @@ String getReleaseVersion() {
   return env.BRANCH_NAME.substring("release/".length());
 }
 
-boolean isMainBranch() {
-  return mainBranch.equals(env.BRANCH_NAME)
+boolean isDevelopmentBranch() {
+  return developmentBranch.equals(env.BRANCH_NAME)
 }
 
 void withGPGEnvironment(def closure) {

scm-ui/ui-components/src/buttons/OpenInFullscreenButton.tsx

@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+import * as React from "react";
+import { FC, ReactNode, useState } from "react";
+import { useTranslation } from "react-i18next";
+import styled from "styled-components";
+import FullscreenModal from "../modals/FullscreenModal";
+import Tooltip from "../Tooltip";
+
+type Props = {
+  modalTitle: string;
+  modalBody: ReactNode;
+  tooltipStyle?: "tooltipComponent" | "htmlTitle";
+};
+
+const Button = styled.a`
+  width: 50px;
+  &:hover {
+    color: #33b2e8;
+  }
+`;
+
+const OpenInFullscreenButton: FC<Props> = ({ modalTitle, modalBody, tooltipStyle = "tooltipComponent" }) => {
+  const [t] = useTranslation("repos");
+  const [showModal, setShowModal] = useState(false);
+
+  const tooltip = t("diff.fullscreen.open");
+  const content = (
+    <>
+      <Button
+        title={tooltipStyle === "htmlTitle" ? tooltip : undefined}
+        className="button"
+        onClick={() => setShowModal(true)}
+      >
+        <i className="fas fa-search-plus" />
+      </Button>
+      {showModal && (
+        <FullscreenModal
+          title={modalTitle}
+          closeFunction={() => setShowModal(false)}
+          body={modalBody}
+          active={showModal}
+        />
+      )}
+    </>
+  );
+
+  if (tooltipStyle === "htmlTitle") {
+    return <>{content}</>;
+  }
+  return (
+    <Tooltip message={tooltip} location="top">
+      {content}
+    </Tooltip>
+  );
+};
+
+export default OpenInFullscreenButton;

scm-ui/ui-components/src/buttons/index.ts

@@ -33,4 +33,5 @@ export { default as SubmitButton } from "./SubmitButton";
 export { default as DownloadButton } from "./DownloadButton";
 export { default as ButtonGroup } from "./ButtonGroup";
 export { default as ButtonAddons } from "./ButtonAddons";
+export { default as OpenInFullscreenButton } from "./OpenInFullscreenButton";
 export { default as RemoveEntryOfTableButton } from "./RemoveEntryOfTableButton";

scm-ui/ui-components/src/modals/FullscreenModal.tsx

@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+import * as React from "react";
+import { FC, ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { Modal } from "./Modal";
+import Button from "../buttons/Button";
+import styled from "styled-components";
+
+type Props = {
+  title: string;
+  closeFunction: () => void;
+  body: ReactNode;
+  active: boolean;
+};
+
+const FullSizedModal = styled(Modal)`
+  & .modal-card {
+    width: 98%;
+    max-height: 97vh;
+  }
+`;
+
+const FullscreenModal: FC<Props> = ({ title, closeFunction, body, active }) => {
+  const [t] = useTranslation("repos");
+  const footer = <Button label={t("diff.fullscreen.close")} action={closeFunction} color="grey" />;
+
+  return <FullSizedModal title={title} closeFunction={closeFunction} body={body} footer={footer} active={active} />;
+};
+
+export default FullscreenModal;

scm-ui/ui-components/src/modals/Modal.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 import * as React from "react";
-import {FC} from "react";
+import { FC } from "react";
 import classNames from "classnames";
 import usePortalRootElement from "../usePortalRootElement";
 import ReactDOM from "react-dom";
@@ -53,7 +53,7 @@ export const Modal: FC<Props> = ({ title, closeFunction, body, footer, active, c
 
   const modalElement = (
     <div className={classNames("modal", className, isActive)}>
-      <div className="modal-background" />
+      <div className="modal-background" onClick={closeFunction} />
       <div className="modal-card">
         <header className={classNames("modal-card-head", `has-background-${headColor}`)}>
           <p className="modal-card-title is-marginless">{title}</p>

scm-ui/ui-components/src/modals/index.ts

@@ -26,3 +26,4 @@
 
 export { default as ConfirmAlert, confirmAlert } from "./ConfirmAlert";
 export { default as Modal } from "./Modal";
+export { default as FullscreenModal } from "./FullscreenModal";

scm-ui/ui-components/src/repos/DiffFile.tsx

@@ -33,7 +33,7 @@ import Icon from "../Icon";
 import { Change, ChangeEvent, DiffObjectProps, File, Hunk as HunkType } from "./DiffTypes";
 import TokenizedDiffView from "./TokenizedDiffView";
 import DiffButton from "./DiffButton";
-import { MenuContext } from "@scm-manager/ui-components";
+import { MenuContext, OpenInFullscreenButton } from "@scm-manager/ui-components";
 import DiffExpander, { ExpandableHunk } from "./DiffExpander";
 import HunkExpandLink from "./HunkExpandLink";
 import { Modal } from "../modals";
@@ -91,6 +91,15 @@ const ChangeTypeTag = styled(Tag)`
   margin-left: 0.75rem;
 `;
 
+const MarginlessModalContent = styled.div`
+  margin: -1.25rem;
+
+  & .panel-block {
+    flex-direction: column;
+    align-items: stretch;
+  }
+`;
+
 class DiffFile extends React.Component<Props, State> {
   static defaultProps: Partial<Props> = {
     defaultCollapse: false,
@@ -406,12 +415,8 @@ class DiffFile extends React.Component<Props, State> {
     const { file, collapsed, sideBySide, diffExpander, expansionError } = this.state;
     const viewType = sideBySide ? "split" : "unified";
 
-    let body = null;
-    let icon = "angle-right";
-    if (!collapsed) {
     const fileAnnotations = fileAnnotationFactory ? fileAnnotationFactory(file) : null;
-      icon = "angle-down";
-      body = (
+    const innerContent = (
       <div className="panel-block is-paddingless">
         {fileAnnotations}
         <TokenizedDiffView className={viewType} viewType={viewType} file={file}>
@@ -423,10 +428,21 @@ class DiffFile extends React.Component<Props, State> {
         </TokenizedDiffView>
       </div>
     );
+    let icon = "angle-right";
+    let body = null;
+    if (!collapsed) {
+      icon = "angle-down";
+      body = innerContent;
     }
     const collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit" /> : null;
     const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
-    const sideBySideToggle = file.hunks && file.hunks.length && (
+    const openInFullscreen = file?.hunks?.length ? (
+      <OpenInFullscreenButton
+        modalTitle={file.type === "delete" ? file.oldPath : file.newPath}
+        modalBody={<MarginlessModalContent>{innerContent}</MarginlessModalContent>}
+      />
+    ) : null;
+    const sideBySideToggle = file?.hunks?.length && (
       <MenuContext.Consumer>
         {({ setCollapsed }) => (
           <DiffButton
@@ -447,6 +463,7 @@ class DiffFile extends React.Component<Props, State> {
       <ButtonWrapper className={classNames("level-right", "is-flex")}>
         <ButtonGroup>
           {sideBySideToggle}
+          {openInFullscreen}
           {fileControls}
         </ButtonGroup>
       </ButtonWrapper>
@@ -465,7 +482,11 @@ class DiffFile extends React.Component<Props, State> {
     }
 
     return (
-      <DiffFilePanel className={classNames("panel", "is-size-6")} collapsed={(file && file.isBinary) || collapsed} id={this.getAnchorId(file)}>
+      <DiffFilePanel
+        className={classNames("panel", "is-size-6")}
+        collapsed={(file && file.isBinary) || collapsed}
+        id={this.getAnchorId(file)}
+      >
         {errorModal}
         <div className="panel-heading">
           <FlexWrapLevel className="level">

scm-ui/ui-webapp/public/locales/de/repos.json

@@ -269,7 +269,11 @@
     "expandLastBottomByLines": "Bis zu {{count}} weitere Zeilen laden",
     "expandLastBottomComplete": "Alle verbleibenden Zeilen laden",
     "expanding": "Zeilen werden geladen ...",
-    "expansionFailed": "Fehler beim Laden der zusätzlichen Zeilen"
+    "expansionFailed": "Fehler beim Laden der zusätzlichen Zeilen",
+    "fullscreen": {
+      "open": "In Vollbildansicht öffnen",
+      "close": "Schließen"
+    }
   },
   "fileUpload": {
     "clickHere": "Klicken Sie hier um Ihre Datei hochzuladen.",

scm-ui/ui-webapp/public/locales/en/repos.json

@@ -276,7 +276,11 @@
     "expandLastBottomByLines": "load up to {{count}} more lines",
     "expandLastBottomComplete": "load all remaining lines",
     "expanding": "loading lines ...",
-    "expansionFailed": "Error while loading additional lines"
+    "expansionFailed": "Error while loading additional lines",
+    "fullscreen": {
+      "open": "Open in Fullscreen",
+      "close": "Close"
+    }
   },
   "fileUpload": {
     "clickHere": "Click here to select your file",

scm-ui/ui-webapp/src/repos/sources/components/content/SourcecodeViewer.tsx

@@ -21,77 +21,38 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
-import { WithTranslation, withTranslation } from "react-i18next";
+import React, { FC, useEffect, useState } from "react";
 import { apiClient, ErrorNotification, Loading, SyntaxHighlighter } from "@scm-manager/ui-components";
 import { File, Link } from "@scm-manager/ui-types";
 
-type Props = WithTranslation & {
+type Props = {
   file: File;
   language: string;
 };
 
-type State = {
-  content: string;
-  error?: Error;
-  loaded: boolean;
-  currentFileRevision: string;
-};
+const SourcecodeViewer: FC<Props> = ({ file, language }) => {
+  const [content, setContent] = useState("");
+  const [error, setError] = useState<Error | undefined>(undefined);
+  const [loading, setLoading] = useState(true);
+  const [currentFileRevision, setCurrentFileRevision] = useState("");
 
-class SourcecodeViewer extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      content: "",
-      loaded: false,
-      currentFileRevision: ""
-    };
-  }
-
-  componentDidMount() {
-    this.fetchContentIfChanged();
-  }
-
-  componentDidUpdate() {
-    this.fetchContentIfChanged();
-  }
-
-  private fetchContentIfChanged() {
-    const { file } = this.props;
-    const { currentFileRevision } = this.state;
+  useEffect(() => {
     if (file.revision !== currentFileRevision) {
-      this.fetchContent();
-    }
-  }
-
-  fetchContent = () => {
-    const { file } = this.props;
       getContent((file._links.self as Link).href)
         .then(content => {
-        this.setState({
-          content,
-          loaded: true,
-          currentFileRevision: file.revision
-        });
+          setContent(content);
+          setCurrentFileRevision(file.revision);
+          setLoading(false);
         })
-      .catch(error => {
-        this.setState({
-          error,
-          loaded: true
-        });
-      });
-  };
-
-  render() {
-    const { content, error, loaded } = this.state;
-    const language = this.props.language;
+        .catch(setError);
+    }
+  }, [currentFileRevision, file]);
 
   if (error) {
     return <ErrorNotification error={error} />;
   }
 
-    if (!loaded) {
+  if (loading) {
     return <Loading />;
   }
 
@@ -100,8 +61,7 @@ class SourcecodeViewer extends React.Component<Props, State> {
   }
 
   return <SyntaxHighlighter language={getLanguage(language)} value={content} />;
-  }
-}
+};
 
 export function getLanguage(language: string) {
   return language.toLowerCase();
@@ -111,4 +71,4 @@ export function getContent(url: string) {
   return apiClient.get(url).then(response => response.text());
 }
 
-export default withTranslation("repos")(SourcecodeViewer);
+export default SourcecodeViewer;

scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx

@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
+import React, { ReactNode } from "react";
 import { connect } from "react-redux";
 import { WithTranslation, withTranslation } from "react-i18next";
 import classNames from "classnames";
 import styled from "styled-components";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
 import { File, Repository } from "@scm-manager/ui-types";
-import { DateFromNow, ErrorNotification, FileSize, Icon } from "@scm-manager/ui-components";
+import { DateFromNow, ErrorNotification, FileSize, Icon, OpenInFullscreenButton } from "@scm-manager/ui-components";
 import { getSources } from "../modules/sources";
 import FileButtonAddons from "../components/content/FileButtonAddons";
 import SourcesView from "./SourcesView";
@@ -82,6 +82,12 @@ const LighterGreyBackgroundTable = styled.table`
   background-color: #fbfbfb;
 `;
 
+const BorderLessDiv = styled.div`
+  margin: -1.25rem;
+  border: none;
+  box-shadow: none;
+`;
+
 export type SourceViewSelection = "source" | "history" | "annotations";
 
 class Content extends React.Component<Props, State> {
@@ -106,7 +112,7 @@ class Content extends React.Component<Props, State> {
     });
   };
 
-  showHeader() {
+  showHeader(content: ReactNode) {
     const { repository, file, revision } = this.props;
     const { selected, collapsed } = this.state;
     const icon = collapsed ? "angle-right" : "angle-down";
@@ -129,6 +135,11 @@ class Content extends React.Component<Props, State> {
           </div>
           <div className="buttons is-grouped">
             {selector}
+            <OpenInFullscreenButton
+              modalTitle={file?.name}
+              modalBody={<BorderLessDiv className="panel">{content}</BorderLessDiv>}
+              tooltipStyle="htmlTitle"
+            />
             <ExtensionPoint
               name="repos.sources.content.actionbar"
               props={{
@@ -211,24 +222,18 @@ class Content extends React.Component<Props, State> {
     const { file, revision, repository, path, breadcrumb } = this.props;
     const { selected, errorFromExtension } = this.state;
 
-    const header = this.showHeader();
     let content;
     switch (selected) {
       case "source":
-        content = (
-          <SourcesView revision={revision} file={file} repository={repository} path={path}/>
-        );
+        content = <SourcesView revision={revision} file={file} repository={repository} path={path} />;
         break;
       case "history":
-        content = (
-          <HistoryView file={file} repository={repository}/>
-        );
+        content = <HistoryView file={file} repository={repository} />;
         break;
       case "annotations":
-        content = (
-          <AnnotateView file={file} repository={repository} />
-        );
+        content = <AnnotateView file={file} repository={repository} />;
     }
+    const header = this.showHeader(content);
     const moreInformation = this.showMoreInformation();
 
     return (

scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java

@@ -251,6 +251,7 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
       builder.add(getGroupAutocompletePermission());
       builder.add(getChangeOwnPasswordPermission(user));
       builder.add(getApiKeyPermission(user));
+      builder.add(getPublicKeyPermission(user));
     }
 
     SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(ImmutableSet.of(Role.USER));
@@ -267,6 +268,10 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
     return UserPermissions.changePassword(user).asShiroString();
   }
 
+  private String getPublicKeyPermission(User user) {
+    return UserPermissions.changePublicKeys(user).asShiroString();
+  }
+
   private String getApiKeyPermission(User user) {
     return UserPermissions.changeApiKeys(user).asShiroString();
   }

scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java

@@ -167,8 +167,8 @@ public class DefaultAuthorizationCollectorTest {
 
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.contains(Role.USER));
-    assertThat(authInfo.getStringPermissions(), hasSize(5));
-    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "user:read:trillian", "user:changeApiKeys:trillian"));
+    assertThat(authInfo.getStringPermissions(), hasSize(6));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "user:read:trillian", "user:changeApiKeys:trillian", "user:changePublicKeys:trillian"));
     assertThat(authInfo.getObjectPermissions(), nullValue());
   }
 
@@ -212,7 +212,7 @@ public class DefaultAuthorizationCollectorTest {
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.containsInAnyOrder(Role.USER));
     assertThat(authInfo.getObjectPermissions(), nullValue());
-    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "repository:read,pull:one", "repository:read,pull,push:two", "user:read:trillian", "user:changeApiKeys:trillian"));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "repository:read,pull:one", "repository:read,pull,push:two", "user:read:trillian", "user:changeApiKeys:trillian", "user:changePublicKeys:trillian"));
   }
 
   /**
@@ -244,7 +244,7 @@ public class DefaultAuthorizationCollectorTest {
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.containsInAnyOrder(Role.USER));
     assertThat(authInfo.getObjectPermissions(), nullValue());
-    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "repository:read,pull:one", "repository:read,pull,push:two", "user:read:trillian", "user:changeApiKeys:trillian"));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "repository:read,pull:one", "repository:read,pull,push:two", "user:read:trillian", "user:changeApiKeys:trillian", "user:changePublicKeys:trillian"));
   }
 
   /**
@@ -288,7 +288,9 @@ public class DefaultAuthorizationCollectorTest {
       "repository:system:one",
       "repository:group:two",
       "user:read:trillian",
-      "user:changeApiKeys:trillian"));
+      "user:changeApiKeys:trillian",
+      "user:changePublicKeys:trillian"
+    ));
   }
 
   /**
@@ -335,7 +337,7 @@ public class DefaultAuthorizationCollectorTest {
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.containsInAnyOrder(Role.USER));
     assertThat(authInfo.getObjectPermissions(), nullValue());
-    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("one:one", "two:two", "user:read:trillian", "user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "user:changeApiKeys:trillian"));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("one:one", "two:two", "user:read:trillian", "user:autocomplete", "group:autocomplete", "user:changePassword:trillian", "user:changeApiKeys:trillian", "user:changePublicKeys:trillian"));
   }
 
   private void authenticate(User user, String group, String... groups) {