diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml new file mode 100644 index 0000000000..4279eb4edf --- /dev/null +++ b/.github/workflows/proxy.yml @@ -0,0 +1,43 @@ +# This is a basic workflow to help you get started with Actions + +name: Proxy CI + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master ] + paths: + - 'src/proxy/**' + pull_request: + branches: [ master, release-* ] + paths: + - 'src/proxy/**' + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Cache Gradle + uses: actions/cache@v1 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-proxy-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-proxy-gradle- + - name: Gradle Build + working-directory: src/proxy/ + run: | + chmod +x gradlew + ./gradlew clean build diff --git a/docs/apidoc/_sidebar.md b/docs/apidoc/_sidebar.md index c05cc43bc8..f90d1a37c5 100644 --- a/docs/apidoc/_sidebar.md +++ b/docs/apidoc/_sidebar.md @@ -48,4 +48,6 @@ - [分发接口](/apidoc/replication/remote-replication.md) - [同步执行日志接口](/apidoc/replication/record.md) - **审计日志** - - [审计日志接口](/apidoc/log/log.md) \ No newline at end of file + - [审计日志接口](/apidoc/log/log.md) +- **Proxy** + - [Proxy接口](/apidoc/proxy/proxy.md) \ No newline at end of file diff --git a/docs/apidoc/proxy/proxy.md b/docs/apidoc/proxy/proxy.md new file mode 100644 index 0000000000..00328f29fa --- /dev/null +++ b/docs/apidoc/proxy/proxy.md @@ -0,0 +1,187 @@ +## bkrepo proxy相关接口 + +### 创建proxy + +- API: POST /auth/api/proxy/create +- API 名称: create_proxy +- 功能说明: + - 中文:创建proxy + - English:create proxy + +- input body: + +``` +{ + "projectId": "demo", + "clusterName": "center", + "displayName": "xxx", + "domain": "http://xxx", + "syncTimeRange": "0-24", + "syncRateLimit": -1, + "cacheExpireDays": 7 +} +``` + +- input 字段说明 + +| 字段 | 类型 | 是否必须 | 默认值 | 说明 | Description | +| ---- | ------ | -------- | ------ | -------- | ------------- | +| projectId | string | 是 | 无 | 项目Id | the project id | +| clusterName | string | 是 | 无 | 集群名称 | the cluster name | +| displayName | string | 是 | 无 | proxy展示名 | the display name | +| domain | string | 是 | 无 | proxy访问域名 | the domain | +| syncTimeRange | string | 是 | 0-24 | proxy同步时间范围 | the sync time range | +| syncRateLimit | int | 否 | -1 | proxy同步速率限制,单位字节,-1表示不限制 | the sync rate limit | +| cacheExpireDays | int | 否 | 7 | proxy缓存过期天数 | the cache expire days | + + +- output: + +``` +{ + "code": 0, + "message": null, + "data": { + "name": "557c8d7574", + "displayName": "xxx", + "projectId": "xxx", + "clusterName": "center", + "domain": "http://xxx", + "ip": "Unknown", + "status": "CREATE", + "syncRateLimit": -1, + "syncTimeRange": "0-24", + "cacheExpireDays": 7 + }, + "traceId": "4d617888730986188f0ed7564269728d" +} + + +``` + +- output 字段说明 + +| 字段 | 类型 | 说明 | Description | +| ------- | -------------- | --------------------------------------- | ------------------------- | +| code | bool | 错误编码。 0表示success,>0表示失败错误 | 0:success, other: failure | +| message | result message | 错误消息 | the failure message | +| data | object | result data | the data for response | +| traceId | string | 请求跟踪id | the trace id | + + +### 删除proxy + +- API: DELETE /auth/api/proxy/delete/{projectId}/{name} +- API 名称: delete_proxy +- 功能说明: + - 中文:删除proxy + - English:delete proxy + +- input body: + +``` json + +``` + +- input 字段说明 + +| 字段 | 类型 | 是否必须 | 默认值 | 说明 | Description | +| ---- | ------ | -------- | ------ | ------ | ----------- | +| projectId | string | 是 | 无 | 项目ID | the project id | +| name | string | 是 | 无 | proxy名 | the proxy name | + +- output: + +``` +{ + "code":0, + "data":null, + "message":"", + "traceId":"" +} + +``` + +- output 字段说明 + +| 字段 | 类型 | 说明 | Description | +| ------- | -------------- | --------------------------------------- | ------------------------- | +| code | bool | 错误编码。 0表示success,>0表示失败错误 | 0:success, other: failure | +| message | result message | 错误消息 | the failure message | +| data | object | result data | the data for response | +| traceId | string | 请求跟踪id | the trace id | + +### 分页查询Proxy列表 + +- API: GET /auth/api/proxy/page/{projectId}?name=xxx&displayName=xxx&pageNumber=1&pageSize=20 +- API 名称: list_proxy +- 功能说明: + - 中文:分页查询Proxy列表 + - English:list proxy + + +- input 字段说明 +| 字段 | 类型 | 是否必须 | 默认值 | 说明 | Description | +| ---- | ------ | -------- | ------ | ------ | ----------- | +| projectId | string | 是 | 无 | 项目ID | the project id | +| name | string | 否 | 无 | proxy名 | the proxy name | +| displayName | string | 否 | 无 | proxy展示名 | the proxy display name | +| pageNumber | int | 是 | 无 | 页数 | the page number | +| pageSize | int | 是 | 无 | 页大小 | the page size | + + +- output: + +``` +{ + "code": 0, + "message": null, + "data": { + "pageNumber": 1, + "pageSize": 20, + "totalRecords": 1, + "totalPages": 1, + "records": [ + { + "name": "0y54vD", + "displayName": "test", + "projectId": "demo", + "clusterName": "test", + "domain": "http://127.0.0.1", + "ip": "127.0.0.1", + "status": "OFFLINE", + "syncRateLimit": 1024, + "syncTimeRange": "0-24", + "cacheExpireDays": 7 + } + ], + "count": 1, + "page": 1 + }, + "traceId": "6bfc5132a349072726d688764a8b1d67" +} + +``` + +- output 字段说明 + +| 字段 | 类型 | 说明 | Description | +| ------- | -------------- | --------------------------------------- | ------------------------- | +| code | bool | 错误编码。 0表示success,>0表示失败错误 | 0:success, other: failure | +| message | result message | 错误消息 | the failure message | +| data | object array | result data | the data for response | +| traceId | string | 请求跟踪id | the trace id | + +### 下载proxy +- API: GET /generic/api/proxy/download/{projectId}/{name} +- API 名称: download proxy +- 功能说明: + - 中文:下载proxy + - English:download proxy + + +- input 字段说明 +| 字段 | 类型 | 是否必须 | 默认值 | 说明 | Description | +| ---- | ------ | -------- | ------ | ------ | ----------- | +| projectId | string | 是 | 无 | 项目ID | the project id | +| name | string | 否 | 无 | proxy名 | the proxy name | \ No newline at end of file diff --git a/docs/apidoc/proxy/router.md b/docs/apidoc/proxy/router.md new file mode 100644 index 0000000000..b8f4b3ac0b --- /dev/null +++ b/docs/apidoc/proxy/router.md @@ -0,0 +1,101 @@ +## bkrepo router-controller相关接口 + +### 增加路由策略 + +- API: POST /router-controller/api/router/admin/policy +- API 名称: add_policy +- 功能说明: + - 中文:增加路由策略 + - English:add policy + +- input body: + +``` +{ + "users": ["user1", "user2"], + "projectIds": ["project1", "project2"], + "destRouterNodeId": "proxy1" +} +``` + +- input 字段说明 + +| 字段 | 类型 | 是否必须 | 默认值 | 说明 | Description | +| ---- | ------ | -------- | ------ | -------- | ------------- | +| users | list | 是 | 无 | 需要路由的用户 | the users | +| projectIds | list | 是 | 无 | 需要路由的项目 | the project id list | +| destRouterNodeId | string | 是 | 无 | proxy名 | the proxy name | + + +- output: + +``` +{ + "code": 0, + "message": null, + "data": { + "id": "xxxx", + "createdBy": "admin", + "createdDate": "", + "users": ["user1", "user2"], + "projectIds": ["project1", "project2"], + "destRouterNodeId": "proxy1" + }, + "traceId": "4d617888730986188f0ed7564269728d" +} + + +``` + +- output 字段说明 + +| 字段 | 类型 | 说明 | Description | +| ------- | -------------- | --------------------------------------- | ------------------------- | +| code | bool | 错误编码。 0表示success,>0表示失败错误 | 0:success, other: failure | +| message | result message | 错误消息 | the failure message | +| data | object | result data | the data for response | +| traceId | string | 请求跟踪id | the trace id | + + +### 删除路由策略 + +- API: DELETE /router-controller/api/router/admin/policy +- API 名称: delete_policy +- 功能说明: + - 中文:删除路由策略 + - English:delete policy + +- input body: + +``` json + { + "policyId": "xxx" + } +``` + +- input 字段说明 + +| 字段 | 类型 | 是否必须 | 默认值 | 说明 | Description | +| ---- | ------ | -------- | ------ | ------ | ----------- | +| policyId | string | 是 | 无 | 路由策略ID | the policy id | + +- output: + +``` +{ + "code":0, + "data":null, + "message":"", + "traceId":"" +} + +``` + +- output 字段说明 + +| 字段 | 类型 | 说明 | Description | +| ------- | -------------- | --------------------------------------- | ------------------------- | +| code | bool | 错误编码。 0表示success,>0表示失败错误 | 0:success, other: failure | +| message | result message | 错误消息 | the failure message | +| data | object | result data | the data for response | +| traceId | string | 请求跟踪id | the trace id | \ No newline at end of file diff --git a/docs/install/_sidebar.md b/docs/install/_sidebar.md index 352f815ca2..16a9059be2 100644 --- a/docs/install/_sidebar.md +++ b/docs/install/_sidebar.md @@ -5,5 +5,7 @@ - [后端部署](/install/binary/backend) - 容器化部署 - [Helm Charts部署](/install/helm.md) +- proxy部署 + - [说明](/install/proxy.md) - [repo.env配置项](/install/env.md) - [源码编译](/install/compile.md) diff --git a/docs/install/proxy.md b/docs/install/proxy.md new file mode 100644 index 0000000000..49a3c8cfd4 --- /dev/null +++ b/docs/install/proxy.md @@ -0,0 +1,72 @@ +# proxy部署 +1.上传proxy到制品库任意generic仓库,例如上传到bkrepo项目、proxy仓库、完整路径为/proxy.jar + +2.添加generic服务配置,项目、仓库、完整路径和上传的项目、仓库、完整路径保持一致 +```yaml +generic: + config: + proxy: + projectId: bkrepo + repoName: proxy + fullPath: /proxy.jar +``` +3.创建proxy +使用管理员账号通过[接口](../apidoc/proxy/proxy.md#%20创建proxy)创建proxy + +4.下载proxy +使用管理员账号通过[下载接口](../apidoc/proxy/proxy.md#%20下载proxy)下载proxy.jar + +5.运行proxy +**运行依赖JDK版本 1.8** +配置项storage.filesystem.path为文件存储目录,需要确保此目录已创建 + +- Windows +```bashs +# 示例 +javaw -D'storage.filesystem.path=Z:\data\store' -jar proxy.jar +``` +启动成功后可以在当前工作目录下看到logs、runtime两个目录,logs目录中为proxy日志,runtime目录中proxy.pid文件保存了proxy的进程id + +- Linux +添加/etc/systemd/system/service-proxy.service + +/usr/bin/java为java路径 + +/data/store为文件存储目录 + +/data/work/proxy.jar为proxy.jar路径 + +根据实际部署环境调整 +``` +[Unit] +Description=service-proxy +Requires=network-online.target + +[Service] +EnvironmentFile=-/usr/bin/java +Environment=GOMAXPROCS=2 +Restart=on-failure +ExecStart=/usr/bin/java -server -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8 -D'storage.filesystem.path=/data/store' -jar /data/work/proxy.jar +ExecReload=/bin/kill -HUP $MAINPID +KillSignal=SIGTERM + +[Install] +WantedBy=multi-user.target +``` +启动proxy +```bash +systemctl daemon-reload +systemctl start service-proxy +``` + +6.配置router +使用管理员账号通过[接口](../apidoc/proxy/router.md#增加路由策略)配置路由策略 +```bash +curl -X POST --header 'Content-Type: application/json' 'bkrepo.example.com/router-controller/api/router/admin/policy' --data '{ + "destRouterNodeId": "{proxy_name}", + "projectIds": [ + "{projectId}" + ], + "users": [] +}' +``` diff --git a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/ProxyController.kt b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/ProxyController.kt index ee091a81bc..067edfb7c4 100644 --- a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/ProxyController.kt +++ b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/controller/user/ProxyController.kt @@ -43,7 +43,6 @@ import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping -import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @Api("Proxy管理接口") @@ -72,7 +71,7 @@ class ProxyController( @GetMapping("/page/info/{projectId}") fun page( @PathVariable projectId: String, - @RequestParam proxyListOption: ProxyListOption + proxyListOption: ProxyListOption ): Response> { return ResponseBuilder.success(proxyService.page(projectId, proxyListOption)) } diff --git a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/service/bkauth/CIAuthService.kt b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/service/bkauth/CIAuthService.kt index 06ac7245e2..5f222fed09 100644 --- a/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/service/bkauth/CIAuthService.kt +++ b/src/backend/auth/biz-auth/src/main/kotlin/com/tencent/bkrepo/auth/service/bkauth/CIAuthService.kt @@ -219,7 +219,7 @@ class CIAuthService @Autowired constructor(private val devopsAuthConfig: DevopsA return try { val url = "${devopsAuthConfig.getBkciAuthServer()}/auth/api/open/service/auth/projects/users/$user" val request = Request.Builder().url(url).header(DEVOPS_BK_TOKEN, devopsAuthConfig.getBkciAuthToken()) - .header(DEVOPS_GATEWAY_TAG, DEVOPS_PROD_V3).header(DEVOPS_UID, user).get().build() + .header(DEVOPS_UID, user).get().build() val apiResponse = HttpUtils.doRequest(okHttpClient, request, 2, allowHttpStatusSet) val responseObject = objectMapper.readValue(apiResponse.content) logger.debug("getProjectListByUser, requestUrl: [$url], result : [${apiResponse.content}]") @@ -237,7 +237,5 @@ class CIAuthService @Autowired constructor(private val devopsAuthConfig: DevopsA const val DEVOPS_BK_TOKEN = "X-DEVOPS-BK-TOKEN" const val DEVOPS_UID = "X-DEVOPS-UID" const val DEVOPS_PROJECT_ID = "X-DEVOPS-PROJECT-ID" - const val DEVOPS_GATEWAY_TAG = "x-gateway-tag" - const val DEVOPS_PROD_V3 = "prod-v3" } } diff --git a/src/backend/settings.gradle.kts b/src/backend/settings.gradle.kts index fedb4a3e12..f16ee516f8 100644 --- a/src/backend/settings.gradle.kts +++ b/src/backend/settings.gradle.kts @@ -89,5 +89,4 @@ includeAll(":ddc") includeAll(":svn") includeAll(":archive") includeAll(":s3") -includeAll(":proxy") includeAll(":router-controller") diff --git a/src/proxy/.gitignore b/src/proxy/.gitignore new file mode 100644 index 0000000000..fdb28c15c6 --- /dev/null +++ b/src/proxy/.gitignore @@ -0,0 +1,17 @@ +.idea/ +.gradle/ +build/ +target/ +out/ +release/ +reports/ +*.iml +.DS_Store +*.log +node_modules/ + +data/ +logs/ +runtime/ +http-client.private.env.json +.codecc diff --git a/src/backend/proxy/api-proxy/build.gradle.kts b/src/proxy/api-proxy/build.gradle.kts similarity index 94% rename from src/backend/proxy/api-proxy/build.gradle.kts rename to src/proxy/api-proxy/build.gradle.kts index 46c65e7fb3..0e336a54a4 100644 --- a/src/backend/proxy/api-proxy/build.gradle.kts +++ b/src/proxy/api-proxy/build.gradle.kts @@ -30,6 +30,6 @@ */ dependencies { - api(project(":auth:api-auth")) - api(project(":generic:api-generic")) + api("com.tencent.bk.repo:api-auth") + api("com.tencent.bk.repo:api-generic") } diff --git a/src/backend/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt b/src/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt similarity index 100% rename from src/backend/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt rename to src/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt diff --git a/src/backend/proxy/biz-proxy/build.gradle.kts b/src/proxy/biz-proxy/build.gradle.kts similarity index 86% rename from src/backend/proxy/biz-proxy/build.gradle.kts rename to src/proxy/biz-proxy/build.gradle.kts index 76744ba1c2..ed839371d6 100644 --- a/src/backend/proxy/biz-proxy/build.gradle.kts +++ b/src/proxy/biz-proxy/build.gradle.kts @@ -30,8 +30,8 @@ */ dependencies { - implementation(project(":proxy:api-proxy")) - implementation(project(":common:common-service")) - implementation(project(":common:common-security")) - implementation(project(":common:common-artifact:artifact-service")) + implementation(project(":api-proxy")) + implementation("com.tencent.bk.repo:common-service") + implementation("com.tencent.bk.repo:common-security") + implementation("com.tencent.bk.repo:artifact-service") } diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt similarity index 98% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt index 2fa6727aab..5c2815d719 100644 --- a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt +++ b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt @@ -82,7 +82,6 @@ class ProxySyncFileVisitor( val storageKey = if (syncFile.length() == 0L) null else syncFile.readText() val sha256 = file.canonicalPath.split(File.separator).last() -// val url = "$gateway:25903/proxy/replica/blob/push" val url = "$gateway/replication/proxy/replica/blob/push" logger.info("start sync file[${file.canonicalPath}]") val inputStream = if (rate > 0) { diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt similarity index 67% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt index a439f31877..7ff1eb1acc 100644 --- a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt +++ b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt @@ -28,36 +28,55 @@ package com.tencent.bkrepo.proxy.security import com.tencent.bkrepo.common.artifact.constant.PROJECT_ID +import com.tencent.bkrepo.common.artifact.constant.REPO_NAME +import com.tencent.bkrepo.common.artifact.exception.RepoNotFoundException import com.tencent.bkrepo.common.security.exception.PermissionException import com.tencent.bkrepo.common.service.proxy.ProxyEnv +import com.tencent.bkrepo.common.service.proxy.ProxyFeignClientFactory import com.tencent.bkrepo.common.service.util.HttpContextHolder import com.tencent.bkrepo.common.storage.innercos.http.HttpMethod +import com.tencent.bkrepo.repository.api.proxy.ProxyRepositoryClient import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation.Around import org.aspectj.lang.annotation.Aspect import org.springframework.web.servlet.HandlerMapping /** - * 校验上传的项目是否和Proxy所属项目一致 + * 校验项目是否和Proxy所属项目一致 */ @Aspect class ProxyProjectPermissionAspect { + private val proxyRepositoryClient: ProxyRepositoryClient by lazy { + ProxyFeignClientFactory.create("repository") + } + @Around( "@within(org.springframework.web.bind.annotation.RestController) " + "|| @annotation(org.springframework.web.bind.annotation.RestController)" ) fun checkProject(point: ProceedingJoinPoint): Any? { val request = HttpContextHolder.getRequest() + val uriAttribute = request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE) + require(uriAttribute is Map<*, *>) + val projectId = uriAttribute[PROJECT_ID]?.toString() + val repoName = uriAttribute[REPO_NAME]?.toString() + val proxyProjectId = ProxyEnv.getProjectId() if (request.method.equals(HttpMethod.PUT.name, true)) { - val uriAttribute = request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE) - require(uriAttribute is Map<*, *>) - val projectId = uriAttribute[PROJECT_ID]?.toString() - val proxyProjectId = ProxyEnv.getProjectId() if (!projectId.isNullOrBlank() && projectId != proxyProjectId) { throw PermissionException() } } + if (request.method.equals(HttpMethod.GET.name, true)) { + if (projectId.isNullOrBlank() || repoName.isNullOrBlank()) { + throw IllegalArgumentException("$projectId/$repoName") + } + val repoDetail = proxyRepositoryClient.getRepoDetail(projectId, repoName).data + ?: throw RepoNotFoundException("$projectId/$repoName") + if (!repoDetail.public && projectId != proxyProjectId) { + throw PermissionException() + } + } return point.proceed() } } diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt diff --git a/src/backend/proxy/boot-proxy/build.gradle.kts b/src/proxy/boot-proxy/build.gradle.kts similarity index 96% rename from src/backend/proxy/boot-proxy/build.gradle.kts rename to src/proxy/boot-proxy/build.gradle.kts index 60196d80a9..858e74f568 100644 --- a/src/backend/proxy/boot-proxy/build.gradle.kts +++ b/src/proxy/boot-proxy/build.gradle.kts @@ -30,5 +30,5 @@ */ dependencies { - implementation(project(":proxy:biz-proxy")) + implementation(project(":biz-proxy")) } diff --git a/src/backend/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt b/src/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt similarity index 100% rename from src/backend/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt rename to src/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt diff --git a/src/backend/proxy/boot-proxy/src/main/resources/.proxy.properties b/src/proxy/boot-proxy/src/main/resources/.proxy.properties similarity index 99% rename from src/backend/proxy/boot-proxy/src/main/resources/.proxy.properties rename to src/proxy/boot-proxy/src/main/resources/.proxy.properties index 77f96c5fe1..0f301adf9c 100644 --- a/src/backend/proxy/boot-proxy/src/main/resources/.proxy.properties +++ b/src/proxy/boot-proxy/src/main/resources/.proxy.properties @@ -25,8 +25,10 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # + bkrepo.proxy.project.id=##projectId## bkrepo.proxy.name=##name## bkrepo.proxy.secret.key=##secretKey## bkrepo.proxy.cluster.name=##clusterName## bkrepo.gateway=##gateway## + diff --git a/src/backend/proxy/boot-proxy/src/main/resources/bootstrap.yaml b/src/proxy/boot-proxy/src/main/resources/bootstrap.yaml similarity index 100% rename from src/backend/proxy/boot-proxy/src/main/resources/bootstrap.yaml rename to src/proxy/boot-proxy/src/main/resources/bootstrap.yaml diff --git a/src/proxy/build.gradle.kts b/src/proxy/build.gradle.kts new file mode 100644 index 0000000000..baa0671cce --- /dev/null +++ b/src/proxy/build.gradle.kts @@ -0,0 +1,75 @@ +/* + * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. + * + * Copyright (C) 2023 THL A29 Limited, a Tencent company. All rights reserved. + * + * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. + * + * A copy of the MIT License is included in this file. + * + * + * Terms of the MIT License: + * --------------------------------------------------- + * 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. + */ + +plugins { + id("com.tencent.devops.boot") version Versions.DevopsBoot + id("com.tencent.devops.publish") version Versions.DevopsBoot apply false +} + +allprojects { + group=Release.Group + version=Release.Version + + + repositories { + // for debug devops-boot locally + mavenLocal() + maven("https://oss.sonatype.org/content/repositories/snapshots/") + mavenCentral() + maven(url = "https://repo.spring.io/milestone") + } + + apply(plugin = "com.tencent.devops.boot") + + configurations.all { + resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.MINUTES) + } + + dependencyManagement { + imports { + mavenBom("org.springframework.cloud:spring-cloud-sleuth-otel-dependencies:${Versions.SleuthOtel}") + } + dependencies { + val bkrepoVersion = System.getProperty("bkrepo_version") ?: Versions.BkRepo + dependencySet("com.tencent.bk.repo:$bkrepoVersion") { + entry("api-auth") + entry("api-generic") + entry("common-service") + entry("common-security") + entry("artifact-service") + } + dependency("org.apache.commons:commons-text:${Versions.CommonsText}") + dependency("com.tencent.polaris:polaris-discovery-factory:${Versions.Polaris}") + dependency("com.tencent.bk.sdk:crypto-java-sdk:${Versions.CryptoJavaSdk}") + dependency("com.squareup.okhttp3:okhttp:${Versions.OKhttp}") + } + } +} diff --git a/src/proxy/buildSrc/build.gradle.kts b/src/proxy/buildSrc/build.gradle.kts new file mode 100644 index 0000000000..2241922bd6 --- /dev/null +++ b/src/proxy/buildSrc/build.gradle.kts @@ -0,0 +1,36 @@ +/* + * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved. + * + * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. + * + * A copy of the MIT License is included in this file. + * + * + * Terms of the MIT License: + * --------------------------------------------------- + * 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. + */ + +plugins { + `kotlin-dsl` +} + +repositories { + mavenLocal() + maven(url = "https://mirrors.tencent.com/nexus/repository/maven-public") + mavenCentral() +} diff --git a/src/proxy/buildSrc/src/main/kotlin/Versions.kt b/src/proxy/buildSrc/src/main/kotlin/Versions.kt new file mode 100644 index 0000000000..7b105322d6 --- /dev/null +++ b/src/proxy/buildSrc/src/main/kotlin/Versions.kt @@ -0,0 +1,41 @@ +/* + * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved. + * + * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. + * + * A copy of the MIT License is included in this file. + * + * + * Terms of the MIT License: + * --------------------------------------------------- + * 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. + */ + +object Release { + const val Group = "com.tencent.bk.repo.proxy" + const val Version = "1.0.0" +} + +object Versions { + const val DevopsBoot = "0.0.6" + const val BkRepo = "1.1.0-RELEASE" + const val OKhttp = "4.9.0" + const val Polaris = "1.5.2" + const val CommonsText = "1.9" + const val SleuthOtel = "1.0.0-M13" + const val CryptoJavaSdk = "1.1.0" +} diff --git a/src/proxy/gradle/wrapper/gradle-wrapper.jar b/src/proxy/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..7f93135c49 Binary files /dev/null and b/src/proxy/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/proxy/gradle/wrapper/gradle-wrapper.properties b/src/proxy/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..f3f0da4fcc --- /dev/null +++ b/src/proxy/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/proxy/gradlew b/src/proxy/gradlew new file mode 100644 index 0000000000..1aa94a4269 --- /dev/null +++ b/src/proxy/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/proxy/gradlew.bat b/src/proxy/gradlew.bat new file mode 100644 index 0000000000..93e3f59f13 --- /dev/null +++ b/src/proxy/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/backend/proxy/build.gradle.kts b/src/proxy/settings.gradle.kts similarity index 68% rename from src/backend/proxy/build.gradle.kts rename to src/proxy/settings.gradle.kts index 852d2001cd..da814f276e 100644 --- a/src/backend/proxy/build.gradle.kts +++ b/src/proxy/settings.gradle.kts @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. All rights reserved. + * Copyright (C) 2024 THL A29 Limited, a Tencent company. All rights reserved. * * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. * @@ -28,3 +28,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ + +rootProject.name = "bk-repo-proxy" + +pluginManagement { + repositories { + if (System.getenv("GITHUB_WORKFLOW") == null) { + maven(url = "https://mirrors.tencent.com/nexus/repository/gradle-plugins/") + maven(url = "https://mirrors.tencent.com/nexus/repository/maven-public") + maven(url = "https://repo.spring.io/milestone") + } else { + mavenCentral() + maven(url = "https://repo.spring.io/milestone") + gradlePluginPortal() + } + } +} +// +include(":api-proxy") +include(":biz-proxy") +include(":boot-proxy")