seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge with master

pull/539/head
Igor Vinokur 2023-08-24 14:49:06 +03:00
parent a70ad85e6b 8d19ea8046
commit e3fc6111a1
120 changed files with 198 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.github/workflows/release.yml vendored
View File

@ -145,17 +145,17 @@ jobs:
prerelease: false
tag: ${{ github.event.inputs.version }}
token: ${{ secrets.CHE_BOT_GITHUB_TOKEN }}
- name: Create failure MM message
if: ${{ failure() }}
run: |
echo "{\"text\":\":no_entry_sign: Che Server ${{ github.event.inputs.version }} release has failed: https://github.com/eclipse-che/che-server/actions/workflows/release.yml\"}" > mattermost.json
- name: Create success MM message
run: |
echo "{\"text\":\":white_check_mark: Che Server ${{ github.event.inputs.version }} has been released: https://quay.io/eclipse/che-server:${{ github.event.inputs.version }}\"}" > mattermost.json
- name: Send MM message
if: ${{ success() }} || ${{ failure() }}
uses: mattermost/action-mattermost-notify@1.1.0
env:
MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
MATTERMOST_CHANNEL: eclipse-che-releases
MATTERMOST_USERNAME: che-bot
#- name: Create failure MM message
#if: ${{ failure() }}
#run: |
#echo "{\"text\":\":no_entry_sign: Che Server ${{ github.event.inputs.version }} release has failed: https://github.com/eclipse-che/che-server/actions/workflows/release.yml\"}" > mattermost.json
#- name: Create success MM message
#run: |
#echo "{\"text\":\":white_check_mark: Che Server ${{ github.event.inputs.version }} has been released: https://quay.io/eclipse/che-server:${{ github.event.inputs.version }}\"}" > mattermost.json
#- name: Send MM message
#if: ${{ success() }} || ${{ failure() }}
#uses: mattermost/action-mattermost-notify@1.1.0
#env:
#MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
#MATTERMOST_CHANNEL: eclipse-che-releases
#MATTERMOST_USERNAME: che-bot

2
assembly/assembly-che-tomcat/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-che-tomcat</artifactId>
<packaging>jar</packaging>

2
assembly/assembly-main/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>

2
assembly/assembly-root-war/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-root-war</artifactId>
<packaging>war</packaging>

2
assembly/assembly-swagger-war/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-swagger-war</artifactId>
<packaging>war</packaging>

2
assembly/assembly-wsmaster-war/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>

2
assembly/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-assembly-parent</artifactId>

2
core/che-core-api-core/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>

2
core/che-core-api-dto-maven-plugin/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
core/che-core-api-dto/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>

2
core/che-core-api-model/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>

2
core/che-core-db-vendor-h2/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-h2</artifactId>
<name>Che Core :: Commons :: DB :: Vendor H2</name>

2
core/che-core-db-vendor-mysql/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-mysql</artifactId>
<name>Che Core :: Commons :: DB :: Vendor MySQL</name>

2
core/che-core-db-vendor-postgresql/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-postgresql</artifactId>
<name>Che Core :: Commons :: DB :: Vendor PostgreSQL</name>

2
core/che-core-db/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: Commons :: DB</name>

2
core/che-core-logback/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-logback</artifactId>
<packaging>jar</packaging>

2
core/che-core-metrics-core/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-metrics-core</artifactId>
<name>Che Core :: Commons :: Metrics :: Core</name>

2
core/che-core-tracing-core/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-tracing-core</artifactId>
<name>Che Core :: Commons :: Tracing :: Core</name>

2
core/che-core-tracing-metrics/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-tracing-metrics</artifactId>
<name>Che Core :: Commons :: Tracing :: Metrics</name>

2
core/che-core-tracing-web/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-tracing-web</artifactId>
<name>Che Core :: Commons :: Tracing :: Web</name>

2
core/che-core-typescript-dto-maven-plugin/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
core/commons/che-core-commons-annotations/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-inject/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-j2ee/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-json/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-lang/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-observability/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-observability</artifactId>
<name>Che Core :: Commons :: Tracing and Monitoring wrapper</name>

2
core/commons/che-core-commons-schedule/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-test/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-tracing/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-tracing</artifactId>
<name>Che Core :: Commons :: Tracing</name>

2
core/commons/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>

2
core/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

2
dockerfiles/che/Dockerfile
View File

@ -10,7 +10,7 @@
#
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.8-1014
FROM registry.access.redhat.com/ubi8-minimal:8.8-1037
USER root
ENV CHE_HOME=/home/user/eclipse-che
ENV JAVA_HOME=/usr/lib/jvm/jre

2
infrastructures/infrastructure-distributed/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-distributed</artifactId>
<packaging>jar</packaging>

2
infrastructures/infrastructure-factory/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-factory</artifactId>
<packaging>jar</packaging>

2
infrastructures/infrastructure-metrics/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infrastructure-metrics</artifactId>

2
infrastructures/infrastructure-permission/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-permission</artifactId>
<name>Infrastructure :: Kubernetes Permissions</name>

2
infrastructures/kubernetes/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-kubernetes</artifactId>
<name>Infrastructure :: Kubernetes</name>

2
infrastructures/openshift/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che.infrastructure</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>infrastructure-openshift</artifactId>
<name>Infrastructure :: OpenShift</name>

2
infrastructures/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.infrastructure</groupId>

2
multiuser/api/che-multiuser-api-authentication-commons/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authentication-commons</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-authorization-impl/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authorization-impl</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-authorization/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authorization</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-organization-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-organization-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-organization/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-organization</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-permission-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-permission-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-permission/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-permission</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-resource-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-resource-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-resource/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-resource</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-workspace-activity/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-workspace-activity</artifactId>
<packaging>jar</packaging>

2
multiuser/api/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-api</artifactId>

2
multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-cascade-removal</artifactId>
<packaging>jar</packaging>

2
multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-mysql-tck</artifactId>
<packaging>jar</packaging>

2
multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-postgresql-tck</artifactId>
<packaging>jar</packaging>

2
multiuser/integration-tests/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-integration-tests</artifactId>
<packaging>pom</packaging>

2
multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-server</artifactId>
<packaging>jar</packaging>

2
multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-token-provider</artifactId>
<name>Che Multiuser :: Keycloak Token Provider</name>

2
multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-user-remover</artifactId>
<packaging>jar</packaging>

2
multiuser/keycloak/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-keycloak</artifactId>

2
multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication</artifactId>
<packaging>jar</packaging>

2
multiuser/machine-auth/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-machine-auth</artifactId>

2
multiuser/oidc/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-oidc</artifactId>
<packaging>jar</packaging>

2
multiuser/permission/che-multiuser-permission-devfile/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-devfile</artifactId>
<name>Che Multiuser :: Devfile Permissions</name>

2
multiuser/permission/che-multiuser-permission-logger/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-logger</artifactId>
<name>Che Multiuser :: Logger Permissions</name>

2
multiuser/permission/che-multiuser-permission-resource/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-resource</artifactId>
<name>Che Multiuser :: Resource :: Permissions</name>

2
multiuser/permission/che-multiuser-permission-system/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-system</artifactId>
<name>Che Multiuser :: System Permissions</name>

2
multiuser/permission/che-multiuser-permission-user/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-user</artifactId>
<name>Che Multiuser :: User Permissions</name>

2
multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-workspace-activity</artifactId>
<name>Che Multiuser :: Workspace Activity Permissions</name>

2
multiuser/permission/che-multiuser-permission-workspace/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-workspace</artifactId>
<name>Che Multiuser :: Workspace Permissions</name>

2
multiuser/permission/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-permission</artifactId>

2
multiuser/personal-account/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-personal-account</artifactId>
<packaging>jar</packaging>

2
multiuser/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-server</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.multiuser</groupId>

2
multiuser/sql-schema/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-sql-schema</artifactId>

10
pom.xml
View File

@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.che</groupId>
<artifactId>che-server</artifactId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Server</name>
<description>Eclipse Che Server</description>
@ -55,14 +55,14 @@
<com.github.tomakehurst.wiremock-jre8-standalone.version>2.32.0</com.github.tomakehurst.wiremock-jre8-standalone.version>
<com.google.code.guice.version>5.0.1</com.google.code.guice.version>
<com.google.errorprone>2.3.4</com.google.errorprone>
<com.google.guava.version>31.1-jre</com.google.guava.version>
<com.google.http-client.version>1.40.1</com.google.http-client.version>
<com.google.guava.version>32.1.2-jre</com.google.guava.version>
<com.google.http-client.version>1.43.3</com.google.http-client.version>
<com.google.oauth-client.version>1.34.1</com.google.oauth-client.version>
<com.googlecode.gson.version>2.8.9</com.googlecode.gson.version>
<com.h2database.version>2.1.210</com.h2database.version>
<com.jcraft.jsch.version>0.1.55</com.jcraft.jsch.version>
<com.squareup.okhttp3.version>3.14.9</com.squareup.okhttp3.version>
<com.squareup.okio.version>1.17.2</com.squareup.okio.version>
<com.squareup.okio.version>3.5.0</com.squareup.okio.version>
<commons-fileupload.version>1.5</commons-fileupload.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
@ -100,7 +100,7 @@
<license_contributor>Red Hat, Inc. - initial API and implementation</license_contributor>
<?SORTPOM IGNORE?>
<build.info>${project.version}</build.info>
<che.version>7.73.0-SNAPSHOT</che.version>
<che.version>7.74.0-SNAPSHOT</che.version>
<specification.version>1.0-beta2</specification.version>
<?SORTPOM RESUME?>
<license_copyrightOwner>Red Hat, Inc.</license_copyrightOwner>

2
typescript-dto/dto-pom.xml
View File

@ -23,7 +23,7 @@
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
<che.version>7.73.0-SNAPSHOT</che.version>
<che.version>7.74.0-SNAPSHOT</che.version>
</properties>
<repositories>
<repository>

2
wsmaster/che-core-api-account/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-account</artifactId>
<name>Che Core :: API :: Account</name>

2
wsmaster/che-core-api-auth-azure-devops/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-azure-devops</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-auth-bitbucket/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-bitbucket</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-auth-github/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-github</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-auth-gitlab/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-gitlab</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-auth-openshift/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-openshift</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-auth-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth-shared</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-auth/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-auth</artifactId>
<packaging>jar</packaging>

22
wsmaster/che-core-api-auth/src/main/java/org/eclipse/che/security/oauth/EmbeddedOAuthAPI.java
View File

@ -38,11 +38,6 @@ import org.eclipse.che.api.core.rest.shared.dto.Link;
import org.eclipse.che.api.core.rest.shared.dto.LinkParameter;
import org.eclipse.che.api.core.util.LinksHelper;
import org.eclipse.che.api.factory.server.scm.OAuthTokenFetcher;
import org.eclipse.che.api.factory.server.scm.PersonalAccessToken;
import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
import org.eclipse.che.api.factory.server.scm.exception.ScmCommunicationException;
import org.eclipse.che.api.factory.server.scm.exception.ScmConfigurationPersistenceException;
import org.eclipse.che.api.factory.server.scm.exception.ScmUnauthorizedException;
import org.eclipse.che.commons.env.EnvironmentContext;
import org.eclipse.che.commons.subject.Subject;
import org.eclipse.che.security.oauth.shared.dto.OAuthAuthenticatorDescriptor;
@ -64,7 +59,6 @@ public class EmbeddedOAuthAPI implements OAuthAPI, OAuthTokenFetcher {
protected String errorPage;
@Inject protected OAuthAuthenticatorProvider providers;
@Inject protected PersonalAccessTokenManager personalAccessTokenManager;
private String redirectAfterLogin;
@Override
@ -159,25 +153,11 @@ public class EmbeddedOAuthAPI implements OAuthAPI, OAuthTokenFetcher {
if (token != null) {
return token;
}
Optional<PersonalAccessToken> tokenOptional =
personalAccessTokenManager.get(subject, provider.getEndpointUrl());
if (tokenOptional.isPresent()) {
PersonalAccessToken accessToken = tokenOptional.get();
return newDto(OAuthToken.class).withToken(accessToken.getToken());
}
throw new UnauthorizedException(
"OAuth token for user " + subject.getUserId() + " was not found");
} catch (IOException | ScmConfigurationPersistenceException | ScmCommunicationException e) {
} catch (IOException e) {
throw new ServerException(e.getLocalizedMessage(), e);
} catch (ScmUnauthorizedException e) {
throwUnauthorizedException(subject);
}
return null;
}
private void throwUnauthorizedException(Subject subject) throws UnauthorizedException {
throw new UnauthorizedException(
"OAuth token for user " + subject.getUserId() + " was not found");
}
@Override

2
wsmaster/che-core-api-devfile-shared/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-devfile-shared</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-devfile/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-devfile</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-factory-azure-devops/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-azure-devops</artifactId>
<packaging>jar</packaging>

4
wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java
View File

@ -81,10 +81,6 @@ public class AzureDevOpsURLParser {
}
String repoName = matcher.group("repoName");
if (repoName.endsWith(".git")) {
repoName = repoName.substring(0, repoName.length() - 4);
}
String project = matcher.group("project");
if (project == null) {
// if project is not specified, repo name must be equal to project name

13
wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java
View File

@ -71,7 +71,7 @@ public class AzureDevOpsURLParserTest {
"https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo.git",
"MyOrg",
"MyProject",
"MyRepo",
"MyRepo.git",
null,
null
},
@ -79,7 +79,7 @@ public class AzureDevOpsURLParserTest {
"https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo.dot.git",
"MyOrg",
"MyProject",
"MyRepo.dot",
"MyRepo.dot.git",
null,
null
},
@ -100,7 +100,14 @@ public class AzureDevOpsURLParserTest {
null
},
{"https://dev.azure.com/MyOrg/MyProject/_git/-", "MyOrg", "MyProject", "-", null, null},
{"https://dev.azure.com/MyOrg/MyProject/_git/-j.git", "MyOrg", "MyProject", "-j", null, null},
{
"https://dev.azure.com/MyOrg/MyProject/_git/-j.git",
"MyOrg",
"MyProject",
"-j.git",
null,
null
},
{
"https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo?path=MyFile&version=GBmain&_a=contents",
"MyOrg",

2
wsmaster/che-core-api-factory-bitbucket-server/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-bitbucket-server</artifactId>
<packaging>jar</packaging>

7
wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java
View File

@ -11,6 +11,7 @@
*/
package org.eclipse.che.api.factory.server.bitbucket;
import static com.google.common.base.Strings.isNullOrEmpty;
import static java.lang.String.format;
import static java.lang.String.valueOf;
@ -159,6 +160,12 @@ public class BitbucketServerPersonalAccessTokenFetcher implements PersonalAccess
}
}
try {
// Token is added manually by a user without token id. Validate only by requesting user info.
if (isNullOrEmpty(params.getScmTokenId())) {
BitbucketUser user = bitbucketServerApiClient.getUser(params.getToken());
return Optional.of(Pair.of(Boolean.TRUE, user.getName()));
}
// Token is added by OAuth. Token id is available.
BitbucketPersonalAccessToken bitbucketPersonalAccessToken =
bitbucketServerApiClient.getPersonalAccessToken(Long.valueOf(params.getScmTokenId()));
return Optional.of(

17
wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java
View File

@ -231,6 +231,23 @@ public class BitbucketServerPersonalAccessTokenFetcherTest {
// then
assertFalse(result.isEmpty());
assertTrue(result.get().first);
assertEquals(result.get().second, bitbucketUser.getName());
}
@Test
public void shouldValidateTokenWithoutId()
throws ScmUnauthorizedException, ScmCommunicationException, ScmItemNotFoundException {
// given
when(personalAccessTokenParams.getScmProviderUrl()).thenReturn(someBitbucketURL);
when(personalAccessTokenParams.getToken()).thenReturn("token");
when(bitbucketServerApiClient.isConnected(eq(someBitbucketURL))).thenReturn(true);
when(bitbucketServerApiClient.getUser(eq("token"))).thenReturn(bitbucketUser);
// when
Optional<Pair<Boolean, String>> result = fetcher.isValid(personalAccessTokenParams);
// then
assertFalse(result.isEmpty());
assertTrue(result.get().first);
assertEquals(result.get().second, bitbucketUser.getName());
}
@DataProvider

2
wsmaster/che-core-api-factory-bitbucket/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-bitbucket</artifactId>
<packaging>jar</packaging>

30
wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcher.java
View File

@ -13,6 +13,7 @@ package org.eclipse.che.api.factory.server.bitbucket;
import com.google.common.collect.Sets;
import java.util.Optional;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.che.api.auth.shared.dto.OAuthToken;
@ -52,7 +53,13 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
private static final String OAUTH_PROVIDER_NAME = "bitbucket";
/** OAuth scope required to make integration with Bitbucket work. */
public static final String DEFAULT_TOKEN_SCOPE = "repository:write";
public static final String DEFAULT_REPOSITORY_WRITE_TOKEN_SCOPE = "repository:write";
public static final String DEFAULT_PULLREQUEST_WRITE_TOKEN_SCOPE = "pullrequest:write";
public static final String DEFAULT_ACCOUNT_READ_TOKEN_SCOPE = "account";
public static final String DEFAULT_ACCOUNT_WRITE_TOKEN_SCOPE = "account:write";
@Inject
public BitbucketPersonalAccessTokenFetcher(
@ -101,7 +108,9 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
} else if (!valid.get().first) {
throw new ScmCommunicationException(
"Current token doesn't have the necessary privileges. Please make sure Che app scopes are correct and containing at least: "
+ DEFAULT_TOKEN_SCOPE);
+ DEFAULT_REPOSITORY_WRITE_TOKEN_SCOPE
+ " and "
+ DEFAULT_ACCOUNT_READ_TOKEN_SCOPE);
}
return new PersonalAccessToken(
scmServerUrl,
@ -136,7 +145,7 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
try {
String[] scopes = bitbucketApiClient.getTokenScopes(personalAccessToken.getToken()).second;
return Optional.of(Sets.newHashSet(scopes).contains(DEFAULT_TOKEN_SCOPE));
return Optional.of(isValidScope(Sets.newHashSet(scopes)));
} catch (ScmItemNotFoundException | ScmCommunicationException | ScmBadRequestException e) {
return Optional.of(Boolean.FALSE);
}
@ -153,9 +162,7 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
Pair<String, String[]> pair = bitbucketApiClient.getTokenScopes(params.getToken());
return Optional.of(
Pair.of(
Sets.newHashSet(pair.second).contains(DEFAULT_TOKEN_SCOPE)
? Boolean.TRUE
: Boolean.FALSE,
isValidScope(Sets.newHashSet(pair.second)) ? Boolean.TRUE : Boolean.FALSE,
pair.first));
} catch (ScmItemNotFoundException | ScmCommunicationException | ScmBadRequestException e) {
return Optional.empty();
@ -168,4 +175,15 @@ public class BitbucketPersonalAccessTokenFetcher implements PersonalAccessTokenF
+ OAUTH_PROVIDER_NAME
+ "&scope=repository&request_method=POST&signature_method=rsa";
}
/**
* Checks if the given scopes are valid for Bitbucket. Note: that pullrequest:write is a wider
* scope than repository:write, and account:write is a wider scope than account.
*/
private boolean isValidScope(Set<String> scopes) {
return (scopes.contains(DEFAULT_REPOSITORY_WRITE_TOKEN_SCOPE)
|| scopes.contains(DEFAULT_PULLREQUEST_WRITE_TOKEN_SCOPE))
&& (scopes.contains(DEFAULT_ACCOUNT_READ_TOKEN_SCOPE)
|| scopes.contains(DEFAULT_ACCOUNT_WRITE_TOKEN_SCOPE));
}
}

5
wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketApiClientTest.java
View File

@ -87,11 +87,12 @@ public class BitbucketApiClientTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
"repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
String[] scopes = client.getTokenScopes("token1").second;
String[] expectedScopes = {"repository:write"};
String[] expectedScopes = {"repository:write", "account"};
assertNotNull(scopes, "Bitbucket API should have returned a non-null scope array");
assertEqualsNoOrder(
scopes, expectedScopes, "Returned scope array does not match expected values");

11
wsmaster/che-core-api-factory-bitbucket/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketPersonalAccessTokenFetcherTest.java
View File

@ -96,7 +96,7 @@ public class BitbucketPersonalAccessTokenFetcherTest {
@Test(
expectedExceptions = ScmCommunicationException.class,
expectedExceptionsMessageRegExp =
"Current token doesn't have the necessary privileges. Please make sure Che app scopes are correct and containing at least: repository:write")
"Current token doesn't have the necessary privileges. Please make sure Che app scopes are correct and containing at least: repository:write and account")
public void shouldThrowExceptionOnInsufficientTokenScopes() throws Exception {
Subject subject = new SubjectImpl("Username", "id1", "token", false);
OAuthToken oAuthToken = newDto(OAuthToken.class).withToken(bitbucketOauthToken).withScope("");
@ -140,7 +140,8 @@ public class BitbucketPersonalAccessTokenFetcherTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
"repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
PersonalAccessToken token =
@ -158,7 +159,8 @@ public class BitbucketPersonalAccessTokenFetcherTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
"repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
PersonalAccessTokenParams params =
@ -179,7 +181,8 @@ public class BitbucketPersonalAccessTokenFetcherTest {
aResponse()
.withHeader("Content-Type", "application/json; charset=utf-8")
.withHeader(
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER, "repository:write")
BitbucketApiClient.BITBUCKET_OAUTH_SCOPES_HEADER,
"repository:write,account")
.withBodyFile("bitbucket/rest/user/response.json")));
PersonalAccessTokenParams params =

2
wsmaster/che-core-api-factory-github/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-github</artifactId>
<packaging>jar</packaging>

2
wsmaster/che-core-api-factory-gitlab/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<artifactId>che-master-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>7.73.0-SNAPSHOT</version>
<version>7.74.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-factory-gitlab</artifactId>
<packaging>jar</packaging>

Some files were not shown because too many files have changed in this diff Show More