Commit Graph

3149 Commits

Author SHA1 Message Date
Ziming
5a390d2fa0
Merge pull request #8429 from ywk253100/190726_retention_chartserver
Only listing chart repositories when chart server is enabled
2019-07-28 22:52:34 +08:00
Ziming
67b65814d9
Merge pull request #8434 from ywk253100/190727_retention
Fix bugs found in running the retention workflow
2019-07-28 22:52:16 +08:00
wang yan
1975f4a71d Fix logic error in quota middlewware on handling failure response
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-28 12:37:58 +08:00
wang yan
a23ff4e448 Update pull time in artifact table for docker image pull
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-28 12:30:20 +08:00
疯魔慕薇
55cead910f Improve awsecr parseRegion method.
Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
2019-07-28 11:16:44 +08:00
Wenkai Yin
ab792019db Fix bugs found in running the retention workflow
Fix bugs found in running the retention workflow

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-28 10:36:57 +08:00
Wenkai Yin
9235dcff54 Only listing chart repositories when chart server is enabled
Only listing chart repositories when chart server is enabled

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-28 09:08:41 +08:00
Ziming Zhang
83b045f5ec add ut for tag retention controller
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I1469ee13675537ec389a068e4bc29e457b402fa4
2019-07-26 17:55:11 +08:00
Steven Zou
3a7066346b
Merge pull request #8418 from ywk253100/190725_retention_task_log
Implement getting the retention task log
2019-07-26 17:51:05 +08:00
Wenkai Yin
c49a09edb4 Implement getting the retention task log
Implement getting the retention task log

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-26 16:19:37 +08:00
Wenkai Yin(尹文开)
d45674960f
Merge pull request #8417 from goharbor/project-quota-dev
Add feature project quota dev
2019-07-26 15:41:09 +08:00
jwangyangls
993643bb78
Merge pull request #8407 from jwangyangls/oidc-ping
Add test button in configration width oidc mode
2019-07-26 14:30:29 +08:00
wang yan
54101180ae Update log level for init proxy
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 13:39:06 +08:00
He Weiwei
c566a48880 fix(api,project): fix repo, chart count missing in project summary
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-26 13:15:44 +08:00
Yogi_Wang
9deeee5425 Add test button in configration width oidc mode
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-26 10:54:48 +08:00
jwangyangls
fe9eb9da20
Merge pull request #8339 from jwangyangls/quotaPerProject2
Add project quotas  page in configration ,project
2019-07-26 10:25:05 +08:00
wang yan
676b922c95 merge with latest master code with quota branch
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 01:32:45 +08:00
Wang Yan
b9ea3731f7
Merge pull request #8350 from wy65701436/blob-flow-dev
Add size middleware to support quota
2019-07-26 01:25:40 +08:00
Wang Yan
1dfc47d24e Add size middleware to support quota
[Add]:
1, size middleware for quota size
2, count middleware for quota artifact count

[Support]:
1, put, patch, mount blob
2, put manifest

[Refactor]:
1, Add handle response for middlerware
2, Remove the modifyResponse for registry proxy
3, Use the custom response writer to recored status

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 00:28:36 +08:00
Yogi_Wang
b1b915354e Add project quotas in configration page
include quotas page and edit quota page
add quota field  when create project

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-25 18:49:49 +08:00
Wenkai Yin
2e9521ad45 Support to stop one execution of retention
Support to stop one execution of retention

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-25 16:48:00 +08:00
He Weiwei
f3a2280033
Merge pull request #8384 from heww/quota-apis
feat(quota,api): APIs for quotas
2019-07-25 15:19:46 +08:00
He Weiwei
e625f2aa11 feat(quota,api): APIs for quotas
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-25 13:40:26 +08:00
Steven Zou
584dcd8571 support dry run of retention
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-25 12:53:19 +08:00
Steven Zou
b6c4ffee95
Merge pull request #8244 from mmpei/7980-chartReplication
Support helm chart replication from helmhub
2019-07-25 10:30:20 +08:00
jwangyangls
de6c2d51cf
Merge pull request #8370 from jwangyangls/fixUtIssue
Fix UT issue about it should support pagination
2019-07-25 10:22:40 +08:00
jwangyangls
8a6a4addb1
Merge pull request #8369 from jwangyangls/fixSomeIssue
Fix issue
2019-07-25 10:20:05 +08:00
wang yan
4763864dae merge with latest master code with quota feature branch
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-24 08:47:05 -07:00
Steven Zou
c44747fd3c merge code from master and fix conflicts
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-24 17:27:37 +08:00
Wenkai Yin(尹文开)
cd411f6588
Merge pull request #8385 from ywk253100/190724_task_hook
Implement the webhook handler for retention task
2019-07-24 17:22:57 +08:00
Ziming
43c2af9857 map retention with policy (#8313)
Signed-off-by: Ziming Zhang <zziming@vmware.com>

Implement the API and controller of tag retention
 - API handler
 - retention controller
 - dao
2019-07-24 17:22:26 +08:00
Wenkai Yin
e2808f12cf Implement the webhook handler for retention task
Implement the webhook handler for retention task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-24 14:32:05 +08:00
Wenkai Yin
1adf5c976e Create retention client with the configurations got from jobservice config
As the retention client is only used in job which running in jobservice, the configurations that needed to init the client should be read from jobservice

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-24 13:10:10 +08:00
Wenkai Yin(尹文开)
94f0fb506b
Merge pull request #8134 from chlins/refactor/small-refactor-for-huawei-adapter
refactor: adjust some logic in huawei adapter
2019-07-24 12:13:23 +08:00
Wenkai Yin(尹文开)
c4836727be
Merge pull request #8377 from steven-zou/feature/tag_retention-logs
print rich logs in the retention job
2019-07-24 09:54:19 +08:00
Steven Zou
09c56bfa08 print rich logs in the retention job
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-24 09:02:51 +08:00
He Weiwei
ce58c58c01 feat(quota,api): quota support for create project API
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-24 01:02:51 +08:00
Yann David
51eb8bc60f
Search for LDAP_MATCHING_RULE_IN_CHAIN groups
Signed-off-by: Yann David <davidyann88@gmail.com>
2019-07-23 12:19:56 -04:00
Wenkai Yin
03cc8046eb Implement the task management in retention manager
Implement the task management in retention manager

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-23 19:23:04 +08:00
Wenkai Yin
7362fae7cc Implement a common scheduler
Implement a common scheduler that can be used globally

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-23 17:20:31 +08:00
Yogi_Wang
93c336c17d Fix UT issue about it should support pagination
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-23 12:30:12 +08:00
Yogi_Wang
54c142d555 Fix the quoestion of the file setting.json
Clear the error message when Api failed

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-23 11:56:44 +08:00
Steven Zou
ccad9c0a29 support stop in the retention job and register it
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-23 11:05:22 +08:00
wang yan
2292954a31 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-22 15:46:09 +08:00
Wang Yan
e8565a4539
Merge pull request #8335 from reasonerjt/add-oidc-ping-api
Add API to ping OIDC endpoint
2019-07-22 14:30:24 +08:00
Steven Zou
6401314a3d
Merge pull request #8356 from steven-zou/feature/tag_retention-ut
add missing UT cases for index and builder components
2019-07-22 12:47:38 +08:00
Wang Yan
834e604ec0
Merge pull request #8246 from ninjadq/fix_chart_museum_500_error
Fix: Internal server error with messy code when chartmuseum not work
2019-07-22 11:07:55 +08:00
Nathan Lowe
b4e169db26
Fix logger line() call if built outside of the repo root
If harbor is built (or `go test`'d) in a different folder than the repo
root, the call to common/utils/log/line(...) will panic with an index
out of range runtime error because the separator can't find `harbor/src`
in the path.

Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-21 22:30:17 -04:00
Nathan Lowe
a15be60946
Retention: Implement Rule: Always Keep
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-21 22:16:47 -04:00
Steven Zou
01d3243156 add missing UT cases for index and builder components
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-22 10:05:50 +08:00
Jakub Onderka
1723b6fa90 Fixed typo in en-us-lang.json
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
2019-07-20 14:43:58 +02:00
Steven Zou
deb021eb48 rebase and fix name conflicts among packages and vars
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 22:37:54 +08:00
Bernardo Pastorelli
791394a2b1 Make jobservice use the proxy env variables (including no_proxy)
Signed-off-by: Bernardo Pastorelli <berpast@hotmail.com>
2019-07-19 16:32:17 +02:00
Steven Zou
c76c5d7a1f refactor packages to resolve the cycle importing issue
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 18:55:08 +08:00
Wenkai Yin
ddbde72d2e Move the pkg manager/controller declaration to the api package
Move the pkg manager/controller declaration to the api package to avoid the dependency cycle

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-19 17:21:58 +08:00
peimingming
9f777ed43f Fix by comments
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-07-19 17:04:40 +08:00
Will Sun
d38a08b15a
Merge pull request #8341 from AllForNothing/robot-ui
UI Modification: When New Robot
2019-07-19 16:59:14 +08:00
Steven Zou
f0ea62caa9 Merge branch 'feature/tag_retention' into feature/tag_retention-performer 2019-07-19 16:00:13 +08:00
Steven Zou
c2b5d95e02 implement retain action performer
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 15:59:21 +08:00
AllForNothing
bd5b195019 UI Modification: When New Robot
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-19 14:47:30 +08:00
Wenkai Yin
5f1d2bd644 Fix package import cycle issue
Fix package import cycle issue

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-19 13:50:55 +08:00
Will Sun
ec9c216274
Merge pull request #8332 from AllForNothing/time-error
fix issue : time shown for scheduled scanning is incorrect
2019-07-19 11:32:50 +08:00
He Weiwei
9c9b8d3a6d Merge branch 'master' into project-quota-dev 2019-07-19 10:02:51 +08:00
Daniel Jiang
96e2e0b145 Add API to ping OIDC endpoint
This commit adds an API to help admin verify the OIDC endpoint is a
valid one.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-18 19:32:12 +08:00
stonezdj
13772b859e Fix OnBoardGroup issue
Signed-off-by: stonezdj <stonezdj@gmail.com>

Fix issue when adding a HTTP user group to a project member, returns HTTP 500 error.
2019-07-18 19:19:09 +08:00
AllForNothing
9404810a1c fix issue : time shown for scheduled scanning is incorrect
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-18 18:05:01 +08:00
AllForNothing
4979c4a49c The item in CVE whiltelist should be a click-able link
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-18 16:17:43 +08:00
Steven Zou
24190291b6 update doublestar pattern and the failed launcher UT cases
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-18 14:50:02 +08:00
Steven Zou
0994e5efc9
Merge pull request #8321 from nlowe/feat/retention/GH-6657-last-active-n
Retention: Implement Evaluator: Retain Latest K 'Active'
2019-07-18 12:03:41 +08:00
Steven Zou
c8d2a2384a
Merge pull request #8289 from nlowe/feat/retention/GH-6659-keep-most-recently-pulled
Retention: Implement Evaluator: Keep N Most Recently Pulled
2019-07-18 11:27:00 +08:00
Steven Zou
2d62b2eb33
Merge pull request #8317 from steven-zou/feature/retention-selectors
implement label and regexp selectors
2019-07-18 11:25:08 +08:00
Nathan Lowe
040b235472
Retention: Implement Evaluator: Retain Latest K 'Active'
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-17 23:14:29 -04:00
Steven Zou
746d082e2e Merge branch 'master' into feature/tag_retention 2019-07-18 10:40:49 +08:00
Steven Zou
be8a9c0446 implement label and regexp selectors
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-18 10:32:47 +08:00
Nathan Lowe
b61f45e038
Retention: Implement Evaluator: Keep N Most Recently Pulled
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-17 14:29:37 -04:00
Wang Yan
4cdb6fb975
Merge pull request #8239 from bitsf/fix_replication_dockerhub_tls
fix replication dockerhub skip tls
2019-07-17 15:35:29 +08:00
Wenkai Yin(尹文开)
a64e089773
Merge pull request #8210 from stonezdj/http_group_dao2
Add HTTP group support
2019-07-17 15:22:36 +08:00
DQ
af58195a29 Fix: Internal server error with messy code when chartmuseum not work
log err when doesn't get data from chart museum

Signed-off-by: DQ <dengq@vmware.com>
2019-07-17 15:14:50 +08:00
Wenkai Yin
d6c6231e08 Implement the retention client
Implement the retention client

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-17 14:04:29 +08:00
Wang Yan
31c3413ddf
Merge pull request #8288 from wy65701436/mf-workflow-base
Add quota workflow for manifest
2019-07-17 11:25:30 +08:00
Steven Zou
0b2f94b0dd
Merge pull request #8256 from goharbor/feat/retention/GH-6661-retain-newer-than-n-days
Retention: Implement Evaluator: Retain if created less than x days ago
2019-07-17 00:04:40 +08:00
Steven Zou
3243d5bce1
Merge pull request #8255 from goharbor/feat/retention/GH-6660-keep-most-recent-n
Retention: Implement Filter: Keep Latest K
2019-07-17 00:04:02 +08:00
Ziming Zhang
815901ea33 fix
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f2d3c7f1e32b4983c31c23d9753f04239e3c82f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-16 19:24:40 +08:00
stonezdj
bb2ae7c093 Add HTTP group feature
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-07-16 15:38:46 +08:00
Shijun Sun (c)
140a3da238 modify UT for cve-whitelist UI
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-16 15:24:15 +08:00
Ziming Zhang
c22c38994a retention api
Change-Id: I70f2c34d6bb96ecf4cb5359e2b1ab2dbb99fdbf9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-16 15:06:37 +08:00
wang yan
105518fe12 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-16 14:51:37 +08:00
Wang Yan
8ac6bdbbb0 Add quota workflow for quota
1, apply count for manifest if it's a new image
2, insert data for artifact and artifact_blob

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-16 14:48:05 +08:00
Shijun Sun (c)
274ab7bcff add CVE-Whitelist
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-15 19:47:46 +08:00
Nathan Lowe
d7e6b1b621
Sort artifacts before processing and port tests to github.com/stretchr/testify/suite
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-14 22:45:36 -04:00
Nathan Lowe
f03ed9b14c
Port tests to github.com/stretchr/testify/suite
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-14 22:38:26 -04:00
chlins
fc713a1763 refactor: fix unit tests
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-07-12 11:33:31 +08:00
chlins
000fe3d084 refactor: adjust some logic in huawei adapter
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-07-12 11:33:30 +08:00
wang yan
f066d986b9 merge with latest master code 2019-07-11 20:21:15 +08:00
Wang Yan
b98ca7bf0b
Merge pull request #8237 from wy65701436/redis-locker
add redis lock
2019-07-11 20:10:16 +08:00
wang yan
ef14f0cf35 add redis lock, it will be used to lock digest in the quota scenario
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-11 19:24:24 +08:00
Wenkai Yin(尹文开)
44ad142d86
Merge pull request #8260 from ywk253100/190709_launcher
Implement the launcher
2019-07-11 18:21:04 +08:00
Wenkai Yin
91b050a01b Implement the launcher
The commit implements the launcher for tag retention

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-11 17:18:46 +08:00
Steven Zou
69ff8ff8ba
Merge pull request #8277 from steven-zou/feature/tag_retentio_more_evaluators
add more rule evaluators
2019-07-11 14:09:29 +08:00
Steven Zou
07250469ac add more rule evaluators
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-11 10:50:10 +08:00
Steven Zou
52ca6de22a refactor the processor interface
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-11 00:23:19 +08:00
mmpei
f32670058a Fix by comments
Signed-off-by: mmpei <peimingming@corp.netease.com>
2019-07-10 17:31:59 +08:00
Wenkai Yin(尹文开)
3bebf7bc64
Merge pull request #8238 from reasonerjt/project-cve-whitelist
Enable project level CVE whitelist
2019-07-10 14:41:01 +08:00
jwangyangls
432f08b5b5
Merge pull request #8241 from jwangyangls/fixReplicationLabelFilterbug
Fix bug when no labels
2019-07-10 14:38:51 +08:00
jwangyangls
c73fa851ff
Merge pull request #8221 from jwangyangls/addGroupInhttpMode
Add user group when http auth mode
2019-07-10 14:38:31 +08:00
Steven Zou
9756195496 implement retention job
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-10 14:01:17 +08:00
Yogi_Wang
6ef82d4db9 Fix bug when no labels
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-10 13:02:34 +08:00
Nathan Lowe
8b174825c1
Retention: Implement Evaluator: Retain if created less than x days ago
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-09 23:46:26 -04:00
Nathan Lowe
4ecbe749e4
Retention: Implement Filter: Keep Latest K
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-09 23:24:56 -04:00
Wang Yan
155b0b0acd
Merge pull request #8175 from heww/quota-manager
Add manager for quota
2019-07-10 11:03:57 +08:00
peimingming
4946c7bba7 Add helm chart replication from helmhub
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-07-10 11:01:02 +08:00
wang yan
6d0271ee5c Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-10 10:57:10 +08:00
Steven Zou
185f4f3861 refine or.processor implementation and also add UT case
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 22:10:09 +08:00
Steven Zou
3409065438 implement policy builder
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 17:43:19 +08:00
Steven Zou
c36afcd07d add index for rule,selector and performer
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 15:10:53 +08:00
He Weiwei
41ba410bb2 Manager for quota
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-09 13:59:48 +08:00
Wang Yan
7fd0bbcbd2
Merge pull request #8230 from wy65701436/dao-artifact
add dao of artifact
2019-07-09 13:44:05 +08:00
wang yan
7b38389898 update codes per review comments
Signed-off-by: wang yan <wangyan@vmware.com>

fix middlewares per review comments
1, add scheme1 and scheme2 check
2, change MustCompile to Compile

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:19 +08:00
wang yan
b3c5137a2f add copyright and fix codecy
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:19 +08:00
wang yan
57821b1b4c Refactor interceptors code with chain
1, add a blob inteceptors for quota usage
2, add a manifest inteceptors for quota usage

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:11 +08:00
Steven Zou
24ee32d7d1 define the base interfaces for the tag retention feature
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 09:40:59 +08:00
wang yan
24c3753581 add dao of artifact
Signed-off-by: wang yan <wangyan@vmware.com>

Add dao for quota

Signed-off-by: He Weiwei <hweiwei@vmware.com>

fix govet

Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-08 23:42:50 +08:00
Daniel Jiang
8f5f0031c7 Enable project level CVE whitelist
This commit update the project API to support "reuse_sys_cve_whitelist"
setting in project metadata and "cve_whitelist" in project request.
Also modify the interceptor to support project level CVE whitelist if
the reuse flag is false.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-08 18:55:54 +08:00
Yogi_Wang
c57087574a Add user group when http auth mode
add the pages  in project and system

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-08 17:28:38 +08:00
Ziming Zhang
0691a5ad9c fix replication dockerhub tls skip tls
Change-Id: I9584d89cf9bda2b782b0fd556450a81be0fc7510
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-08 08:17:26 +00:00
Wenkai Yin(尹文开)
5f9420a5a7
Merge pull request #8190 from ywk253100/190701_replication
Merge Default ImageRegistry into the native adapter to reduce the duplicate code
2019-07-08 12:47:55 +08:00
Daniel Jiang
c296f0ddfb
Merge pull request #8176 from stonezdj/http_group
Refactor LDAP usergroup
2019-07-08 09:54:31 +08:00
stonezdj
c0ed55445d Refactor LDAP group
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-07-05 14:44:18 +08:00
Wenkai Yin(尹文开)
0f28fe42fd
Merge pull request #8167 from ywk253100/190622_replication
Support v1 signed media type when do the replication
2019-07-05 14:33:22 +08:00
Wenkai Yin(尹文开)
c01bedb740
Merge pull request #8220 from reasonerjt/oidc-rotation-fix
Reload OIDC provider older than 3 seconds
2019-07-05 10:12:33 +08:00
Daniel Jiang
a75bc027de
Merge pull request #8213 from reasonerjt/oidc-helm-push
Handle helm push in OIDC filter
2019-07-04 15:56:50 +08:00
Daniel Jiang
88a5572f8e Reload OIDC provider older than 3 seconds
This commit make sure the OIDC is more actively recreated, to mitigate
the problem in #8177

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-04 14:55:34 +08:00
He Weiwei
4fedfa6580 Add dao for quota
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-04 11:53:26 +08:00
Steven Zou
63e2ce7606
Merge pull request #8209 from steven-zou/fix/enqueuer_schedule_slot
use separate key for the last periodic enqueue data
2019-07-03 21:48:21 +08:00
Steven Zou
8fc693d843
Merge pull request #8208 from steven-zou/fix/enqueuer_ut
fix failure ut case of job service
2019-07-03 17:32:13 +08:00
Daniel Jiang
8a9d352f54 Handle helm push in OIDC filter
Fixes #8130
Enable OIDC filter to handle requests to /api/chartrepo/*

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-03 17:29:37 +08:00
Steven Zou
b88159e747 use separate key for the last periodic enqueue data
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-03 17:08:23 +08:00
Daniel Jiang
5d887ad0d8
Merge pull request #8179 from reasonerjt/interceptor-use-whitelist
Apply CVE white list in interceptor
2019-07-03 15:12:33 +08:00
Steven Zou
1002e3ce17 fix failure ut case of job service
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-03 15:10:41 +08:00
Daniel Jiang
bba4b2a6a4 Apply CVE white list in interceptor
Interceptor will filter the vulnerability in whitelist while calculating
the serverity of an image and determine whether or not to block client
form pulling it.

It will use the system level whitelist in this commit, another commit
will switch to project level whitelist based on setting in a project.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-03 14:13:00 +08:00
Steven Zou
8bb18e73d2
Merge pull request #8159 from ywk253100/190627_label_filter
Update replication label filter
2019-07-03 13:08:54 +08:00
Daniel Jiang
6f166bc02c
Merge pull request #8154 from markpeek/markpeek-registry-health-check
Switch registry health check to a 200 response url
2019-07-03 10:29:35 +08:00
He Weiwei
720dcc72bd Fix read permission of project member read api
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-02 14:40:46 +08:00
jwangyangls
02c5823915
Merge pull request #8182 from jwangyangls/fixVulnerabilityWidth
Fix the different width on vulnerability
2019-07-02 11:56:48 +08:00
jwangyangls
e87381d671
Merge pull request #8178 from jwangyangls/replicationAddLabelFilter
Add label filter in replication Ng
2019-07-02 11:55:55 +08:00
jwangyangls
1916f3c078
Merge pull request #8165 from AllForNothing/filter-ui
fix  filter ui bug : half filter is covered when there is one or two records in a datagrid
2019-07-02 11:07:07 +08:00
Yogi_Wang
9c07caa1a6 Add label filter in replication Ng
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-02 10:53:17 +08:00
Wenkai Yin
8768a5678c Merge Default ImageRegistry into the native adapter to reduce the duplicate code
Merge Default ImageRegistry into the native adapter to reduce the duplicate code

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-01 19:21:12 +08:00
Wenkai Yin(尹文开)
174cfd5de5
Merge pull request #8172 from cd1989/azure-acr-adapter
Implement azure acr adapter
2019-07-01 19:06:19 +08:00
mmpei
5dfc3f2402 Optimize fetch manifest loop when handling notification
Signed-off-by: mmpei <peimingming@corp.netease.com>
2019-07-01 17:54:52 +08:00
Yogi_Wang
c3572028b9 Fix the different width on vulnerability
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-01 17:26:59 +08:00
cd1989
c305103e05 Add unit test for azure adapter
Signed-off-by: cd1989 <chende@caicloud.io>
2019-07-01 14:31:12 +08:00
cd1989
2097e928d0 Implement azure acr adapter
Signed-off-by: cd1989 <chende@caicloud.io>
2019-06-29 18:34:48 +08:00
AllForNothing
322c79f348 fix filter ui bug #7700
Signed-off-by: sshijun <sshijun@vmware.com>
2019-06-28 15:48:24 +08:00
Wenkai Yin
6ba2ace0a6 Update replication label filter
Support specify multiple labels in one label filter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-28 15:03:58 +08:00
Wenkai Yin
d2a938812f Support v1 signed media type when do the replication
Support v1 signed media type when do the replicatio

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-28 13:24:28 +08:00
Wenkai Yin
943dfd32fc Clean up the dao test for replication
Clean up the dao test for replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-28 13:18:26 +08:00
Ziming
a69cea9952
Merge pull request #8028 from bitsf/replication_gcr_ui_1.9
ui change: gcr/ecr driver for replication
2019-06-27 14:16:34 +08:00
Ziming
50180f0d7a
Merge pull request #7946 from bitsf/replication_gcr_1.9
gcr driver for replication
2019-06-27 14:16:07 +08:00
Will Sun
108b9284a5
Merge pull request #8150 from AllForNothing/robot-account-helm-ui
UI modification for creating robot account
2019-06-27 13:23:39 +08:00
Ziming
af548e915e
Merge branch 'master' into replication_gcr_1.9 2019-06-27 11:27:33 +08:00
Steven Zou
5521b7b7ad
Merge pull request #7915 from bitsf/replication_ecr_1.9
aws driver for replication
2019-06-27 11:24:54 +08:00
Wenkai Yin(尹文开)
fce920bbee
Merge pull request #8075 from reasonerjt/sys-vuln-whitelist-api
API for system level vulnerability whitelist
2019-06-27 10:53:09 +08:00
Mark Peek
3cae31da54 Switch registry health check to a 200 response url
The health check for the registry was using "/v2" which returned an
unauthorized response and put additional errors in the logs. Switch
to using "/" which returns an OK response with reduced logging.

Signed-off-by: Mark Peek <markpeek@vmware.com>
2019-06-26 14:23:08 -07:00
Daniel Jiang
4aca812ff2 API for system level vulnerability whitelist
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-06-26 23:35:40 +08:00
sshijun
42cf09fad6 UI modification for creating robot account
Signed-off-by: sshijun <sshijun@vmware.com>
2019-06-26 19:40:02 +08:00
Ziming Zhang
b9dbe429be ui change:gcr/ecr driver for replication
Change-Id: I52aa3a35da898d2501b09ff90b5a65169a6d54ed
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-06-26 09:52:32 +08:00
Ziming Zhang
072bdd101b aws driver for replication
Change-Id: I8792ffce2eaa5975359bb6159a1ba7b85926a925
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-06-25 19:11:27 +08:00
Ziming Zhang
e387c63242 gcr driver for replication
Change-Id: I5a6626950d3878bfa9726b332e68bee59159269f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-06-25 18:08:10 +08:00
Wenkai Yin(尹文开)
f1becf8100
Merge pull request #8078 from tedgxt/optimize_image_delete_event_type
Set Event.Type value to event.EventTypeImageDelete instead of event.EventTypeImagePush when deleting
2019-06-25 16:59:38 +08:00
Wenkai Yin(尹文开)
8da61464b5
Merge pull request #8032 from ywk253100/190529_filter
Support label filter for replication
2019-06-25 16:59:25 +08:00
Will Sun
8ea9e44103
Merge pull request #8119 from AllForNothing/dev_ssj
fix bug: Save button not enabled when all the required fields are filled on Safari, Edge , Internet Explorer
2019-06-24 15:34:17 +08:00
Steven Zou
7c86c98687
Merge pull request #8049 from steven-zou/fix_js_ut_cases
fix failure UT case of job service
2019-06-21 14:55:50 +08:00
sshijun
412c6389d1 fix bug #7829 2019-06-21 14:53:22 +08:00
Steven Zou
b9f45cd30a fix failure UT case of job service
Signed-off-by: Steven Zou <szou@vmware.com>
2019-06-21 13:31:27 +08:00
Yogi_Wang
db4793d318 Fix issue click members and logs tab in project detail page portal will redirect to projects list page when call API failed
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-06-20 14:42:51 +08:00
guanxiatao
b40ee6edc9 Set Event.Type value to event.EventTypeImageDelete instead of event.EventTypeImagePush when deleting
Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>
2019-06-20 09:39:45 +08:00
Wenkai Yin
684df243b2 Support label filter for replication
Only the system level labels are supported to be used as the replication policy filter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-19 20:46:44 +08:00
Steven Zou
89ad59b0d4
Merge pull request #8026 from steven-zou/fix_bug_#7988
add migration process for rdb as well as UT cases
2019-06-17 10:58:42 +08:00
Steven Zou
9bac5e602d
Merge pull request #8030 from ywk253100/190605_replication_bugfix
Fix replication bug
2019-06-13 19:12:29 +08:00
Wenkai Yin
5fef7585c7 Fix replication bug
Fixes #7875, fixes #7968

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-06-13 17:17:29 +08:00
Steven Zou
2bc1402357 add migration process for rdb as well as UT cases
fix issue #7988

Signed-off-by: Steven Zou <szou@vmware.com>
2019-06-12 12:29:51 +08:00
Daniel Jiang
c928924fa5
Merge pull request #8003 from reasonerjt/bump-up-go112
Bump up to go 1.12.5 enable go.mod
2019-06-11 13:21:32 +08:00
wang yan
a4b202d656 remove the id in the post body when to create a robot account
Signed-off-by: wang yan <wangyan@vmware.com>
2019-06-11 10:47:56 +08:00
Daniel Jiang
737eaa396c Bump up to go 1.12.5 enable go.mod
This commit bumps up the version of Go to compile the code to v1.12.5,
and shifts to go.mod for managing depedency.
Some code from "harbor/tests" to "harbor/src/testing" to avoid depedency
loop of modules.

Note that in short term we will still vendor the dependency.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-06-11 00:42:20 +08:00
耐小心
fc6259e793
1: Fix When the log is not found, the prompt is English.
2:Fix When clicking the Refresh Log button is invalid. Set search box to null invalid bug

Signed-off-by: 耐小心 <qiqizjl@qq.com>
2019-06-03 03:17:49 +08:00
jwangyangls
663826e1dc
Merge pull request #7905 from jwangyangls/fix_issue_daliy
Remove the Deplicate utils in lib and app , fix #6365
2019-05-31 14:32:28 +08:00
Yogi_Wang
c52cb4fc9a Remove the Deplicate utils in lib an app , fix #6365, #7807
1.remove the Deplicate utils in lib an app ,fix #6365
2.edit style fix #7807

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-30 10:15:57 +08:00
Qian Deng
592e40bacf
Merge pull request #7859 from wy65701436/return-robot-id
Return account id when to issue a robot
2019-05-29 10:55:20 +08:00
Yogi_Wang
200389b678 Fix bug when we use language with pt-br; change the harbor version from 1.7.x to 1.8
fix bug when we use language with pt-br;
change the harbor version from 1.7.x to 1.8
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-28 15:19:08 +08:00
Yogi_Wang
247d58232a Add robot permission of helm-chart pull/push
add robot permission of helm-chart pull/push

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-23 15:58:42 +08:00
jwangyangls
fbec3ee76f
Merge pull request #7865 from jwangyangls/edit_word_with_robot
Edit the words width vulnerability and robot;
2019-05-23 15:54:43 +08:00
jwangyangls
588287629a
Merge pull request #7844 from jwangyangls/http_to_httpClient
Change http to httpClient of all Api in harbor
2019-05-23 15:35:38 +08:00
Yogi_Wang
471fae6c92 Edit the words width vulnerability and robot;
edit the words width vulnerability and robot;

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-23 15:24:53 +08:00
Yogi_Wang
44054859b9 Change http to httpClient of all Api in harbor
change http to httpClient of all Api in harbor because  since Angular 4.3, Angular has abandoned HTTP and used HTTP Client instead.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-23 13:23:07 +08:00
wang yan
15ca9bfb81 Add ensure settings when to search user in auth proxy
This issue is regresssion that introduced by f92bc8076d (diff-42381e6df5f17ebd3d9165a325d5d8f4), the a.ensure() was removed from SearchUser(), which leads to the alwaysonboard cannot be updated.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-22 17:16:16 +08:00
wang yan
056cfc7e31 Return account id when to issue a robot
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-22 10:39:26 +08:00
wang yan
2068732eef add validation for robot account registration
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-15 15:03:35 +08:00
jwangyangls
a7f8f531f9
Merge pull request #7803 from jwangyangls/addcloseAlertInNewProject
Clear inlineAlert when reopen create project;change add robot error handle
2019-05-15 13:55:44 +08:00
Yogi_Wang
dfbc7b4f8c Clear inlineAlert when reopen create project;change add robot error handle
clear inlineAlert when reopen create project;change add robot error handle

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-15 13:19:15 +08:00
Wang Yan
3be14b7997
fix issue7793: ping ldap server is always success (#7795)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-15 11:35:57 +08:00
Wenkai Yin
e399ffca54
Merge pull request #7799 from reasonerjt/oidc-onboard-user-name
Set the real name of OIDC user when onboarding
2019-05-15 11:35:42 +08:00
Qian Deng
4188c4db76
Merge pull request #7719 from ninjadq/fix_chart_relative_url_issue
Fix chart relative url issue
2019-05-15 10:02:07 +08:00
Daniel Jiang
5f11dbe675 Set the real name of OIDC user when onboarding
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-15 00:44:51 +08:00
stonezdj
99c0a5a498 fix issue7793: ping ldap server is always success
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-14 19:20:54 +08:00
Mia ZHOU
f807c3392f
Merge pull request #7782 from jwangyangls/add_oidc_login_control_redirect
Add a way to login to OIDC by clicking login button
2019-05-14 13:34:44 +08:00
Qian Deng
f607c5177d Fix frontend failure caused by absolute path
Fix failures because front downlowd chart using relative path

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 13:22:06 +08:00
Qian Deng
cd6c5a9f10 Enable absolute url in helm chart
assign public_url to chart-url
remove namespace merge in index.yaml

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-05-14 12:56:20 +08:00
Yogi_Wang
c8b6b41854 Add a way to login to OIDC by clicking login button
add a way to login to OIDC by clicking login button through response status 403

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-14 12:46:36 +08:00
Daniel Jiang
e963ee88c7 Update login controller to return 403 for redirection
As the UI cannot handle 302, update the login controller to return 403
and put the redirection URL in a json response body.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-13 18:16:06 +08:00
Yogi_Wang
131683b4ef Fix_cron schedule bug when call api ' get/schedule ' error
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-10 18:29:42 +08:00
Steven Zou
7576800eb2
Merge pull request #7370 from burdzwastaken/fix/spelling-credentail
Fix misspellings of the word credential
2019-05-10 17:28:50 +08:00
Daniel Jiang
d81afe274c Add filter to handle request with ID token (#7759)
This commit allows request with a valid ID token to access the API.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-10 16:58:25 +08:00
Wenkai Yin
7ee9063c2b
Merge pull request #7758 from ywk253100/190509_bug_fix
Fixes bug in replication
2019-05-10 16:49:19 +08:00
Wenkai Yin
8348c1fa4b
Merge pull request #7635 from heww/validation-failed-status-code
Return 400 status code for validation failed
2019-05-10 14:22:05 +08:00
Wenkai Yin
a7384fc881 Fixes bug in replication
Use internal service name rather than 127.0.0.1 when calling APIs of core in jobservice jobs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-10 14:18:57 +08:00
Steven Zou
e091916d54 fix UT case failure (#7734)
Signed-off-by: Steven Zou <szou@vmware.com>
2019-05-10 13:15:44 +08:00
jwangyangls
4218206b59
Merge pull request #7753 from jwangyangls/addOidcMoreLink
Add Oidc more info link in configration
2019-05-10 10:37:52 +08:00
He Weiwei
58cbaaace8 Return 400 status code for validation failed
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-05-10 10:35:25 +08:00
Fangyuan Cheng
aa68471dfa
Merge pull request #7743 from pureshine/modify-text
Modify the prompt for deleting resources when creating a replication rule.
2019-05-10 00:17:47 +08:00
Yogi_Wang
cd42637f51 Add Oidc more info link in configration
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-10 00:04:33 +08:00
Wang Yan
774a9f8d75
Remove unused configure item cfg_expiration (#7744)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-09 22:07:18 +08:00
Wenkai Yin
9cc203d15b
Merge pull request #7740 from ywk253100/190509_huawei
Rename the adapter name of huawei to huawei-SWR
2019-05-09 21:53:24 +08:00
Wenkai Yin
5ce57a24ac
Merge pull request #7739 from ywk253100/190508_upgrade
Fixes #7693, the filters of replication policy is lost after upgrade
2019-05-09 20:16:13 +08:00
jwangyangls
cc4da4bbbd
Merge pull request #7725 from jwangyangls/fixCancel_cannot_work
Fix question of `Cancel` of OIDC configuration does not work
2019-05-09 17:40:15 +08:00
Wenkai Yin
b73f8a96c3 Fix issue: replication cannot work when Harbor is deployed on Kubernetes whose hairpin mode is disabled (#7718)
Fix issue https://github.com/goharbor/harbor-helm/issues/222: replication cannot work when Harbor is deployed on Kubernetes whose hairpin mode is disabled

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-09 17:10:32 +08:00
Wenkai Yin
4f6116f9c0 Rename the adapter name of huawei to huawei-SWR
Rename the adapter name of huawei to huawei-SWR. Fixes #7732

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-09 17:00:00 +08:00
Mia ZHOU
4e583ad65a
Merge pull request #7731 from jwangyangls/fix_ui_issue1.8
Fix uncheck pull for the robot account generation, pull permission is still assigned
2019-05-09 16:42:11 +08:00
Mia ZHOU
94a6e997ad
Merge pull request #7735 from pureshine/refresh-gc
Automatically refresh the list when the status of gc history is pending or running
2019-05-09 16:41:29 +08:00
FangyuanCheng
83de21601b Modify the prompt for deleting resources when creating a replication rule.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-09 15:38:41 +08:00
Wenkai Yin
8ca3c44b87 Fixes #7693, the filters of replication policy is lost after upgrade
Fixes #7693, the filters of replication policy is lost after upgrade

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-09 14:13:32 +08:00
wang yan
5c12c7713d Return 200 when to post an none schedule
1, Throw the error of job service to UI when to create job schedule.
2, Return 200 when to save none without schedule.

Fixed #7675

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-09 13:32:46 +08:00
FangyuanCheng
78c52eca8a Automatically refresh the list when the status of gc history is pending or running
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-09 13:15:11 +08:00
Daniel Jiang
cbbf2ea973 Redirect regular user to OIDC login page (#7717)
When the auth mode is OIDC, when a user login via Harbor's login form.
If the user does not exist or the user is onboarded via OIDC, he will be
redirected to the OIDC login page.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-09 10:53:40 +08:00
Fangyuan Cheng
1828537672
Merge pull request #7723 from pureshine/filter-loading
Fix filter will always show loading when call API failed
2019-05-09 10:41:24 +08:00
Yogi_Wang
48aac9ae2c Fix uncheck pull for the robot account generation, pull permission is still assigned
fix Uncheck pull for the robot account generation, pull permission is still assigned

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-09 00:37:49 +08:00
jwangyangls
67c5542dd8
Merge pull request #7716 from jwangyangls/fix_api_faild_always_show_loading
Fix always show loading indicator when call API failed;Z-Index issue in repository detail page when event popup widget open;Wrong robot token expiration in system settings when call API failed;UI hangs at deleting when to delete OIDC user
2019-05-08 22:40:23 +08:00
Wang Yan
095f7b2ff7
add scan all and gc schedule migration (#7628)
* add scan all and gc schedule migration

Signed-off-by: wang yan <wangyan@vmware.com>

* Fix gofmt errors

Signed-off-by: wang yan <wangyan@vmware.com>

* Update code according to review comments

Signed-off-by: wang yan <wangyan@vmware.com>

* remove convertschedule return name just return value

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-08 19:11:33 +08:00
Wenkai Yin
6e07a62fe1 Fix #7579: cannot stop the execution during the initialization stage (#7721)
Fix #7579: cannot stop the execution during the initialization stage

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-08 19:11:18 +08:00
Daniel Jiang
f2abfcb598
Merge pull request #7724 from reasonerjt/logger-more-info
print more sectors of file path in logger
2019-05-08 18:28:52 +08:00
Fangyuan Cheng
7810c05fe3
Merge pull request #7697 from pureshine/fix-tooltip
Fix the cron tooltip in replication is not fully displayed in Firefox.
2019-05-08 17:26:20 +08:00
Steven Zou
b664b90b86
Merge pull request #7585 from steven-zou/add_get_jobs_API
add get jobs API to provide powerful job stats management
2019-05-08 17:17:33 +08:00
FangyuanCheng
5c12da4235 Fix filter will always show loading when call API failed
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 16:47:11 +08:00
Wenkai Yin
c557cb3ef3
Merge pull request #7667 from ywk253100/190507_dockerhub_ut
Add more unit test cases for docker hub adapter
2019-05-08 16:35:06 +08:00
Yogi_Wang
fe85d23a90 Merge branch 'master' of https://github.com/goharbor/harbor into fix_api_faild_always_show_loading 2019-05-08 16:33:01 +08:00
Yogi_Wang
03ffe4fade Fix question of Cancel of OIDC configuration does not work
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 16:26:22 +08:00
Daniel Jiang
4118769088 print more sectors of file path in logger
This would help as we have more and more source files having duplicated
names.
Fixes #7202

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-08 15:49:19 +08:00
FangyuanCheng
92315395ea Fix the cron tooltip in replication is not fully displayed in Firefox.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 15:27:11 +08:00
Yogi_Wang
97acf44fbc Fix always show loading indicator when call API failed;Z-Index issue in repository detail page when event popup widget open;Wrong robot token expiration in system settings when call API failed
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 14:27:31 +08:00
Mia ZHOU
709406eb75
Merge pull request #7705 from pureshine/modify-override
Modify the tooltip of the override
2019-05-08 13:57:45 +08:00
Mia ZHOU
3604765d8a
Merge pull request #7715 from pureshine/cannot-save
Fix unable to save after entering invalid cron and then switching back to other schedules
2019-05-08 13:57:00 +08:00
Daniel Jiang
58aed3dde9
Merge pull request #7707 from renmaosheng/harbor-6838
Don't display password when calling api/users API.
2019-05-08 12:50:39 +08:00
Daniel Jiang
7469204ad6
Merge pull request #7666 from wy65701436/block-multiple-mf
add multiple manifest intercepetor handler
2019-05-08 12:21:32 +08:00
Wenkai Yin
01898c9dac
Merge pull request #7709 from reasonerjt/panic-refresh-oidc-token
Make sure panic is not thrown when refresh token
2019-05-08 12:17:32 +08:00
jwangyangls
f4f2278805
Merge pull request #7712 from jwangyangls/oidc_like_ldap
Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
2019-05-08 11:01:19 +08:00
jwangyangls
37c024621e
Merge pull request #7713 from jwangyangls/fix_configration_bug
Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
2019-05-08 10:57:58 +08:00
jwangyangls
e510e5062b
Merge pull request #7714 from jwangyangls/fix_error_message_bug
Fix create project error show in modal;resolve the different color of notification in UI.
2019-05-08 10:55:00 +08:00
FangyuanCheng
a34f99cae4 Fix unable to save after entering invalid cron and then switching back to other schedules
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-08 10:48:48 +08:00
Mia ZHOU
2b5c511c76
Merge pull request #7654 from jwangyangls/remove_required_when_oidc_mode
Remove required  from filed "First and last name" on the OIDC user profile page
2019-05-08 10:06:05 +08:00
Yogi_Wang
0fbc5af2c9 Fix create project error show in modal;resolve the different color of notification in UI.
fix create project error show in modal;resolve the different color of notification in UI.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 03:15:22 +08:00
Yogi_Wang
f14e9c9d52 Fix “Delete” and "Reset Password" should be hidden in user management page;forget Password should be hidden when oidc mode;
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 01:40:32 +08:00
Yogi_Wang
af0a8355eb Remove required from filed "First and last name" on the OIDC user profile page,fix email username cannot save in profile
remove required  from filed "First and last name" on the OIDC user profile page.
fix email username cannot save in profile

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 01:24:18 +08:00
Yogi_Wang
6d0c2f51f3 Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-08 00:43:44 +08:00
Daniel Jiang
c16b44d30b Make sure panic is not thrown when refresh token
Fixes #7695

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-07 20:30:07 +08:00
Steven Ren
8311ff729a Don't display password when calling api/users API.
This change fixes github issue 6838

Signed-off-by: Steven Ren <stevenr@stevenr-a01.vmware.com>
2019-05-07 18:40:36 +08:00
FangyuanCheng
8d30d24edd Modify the tooltip of the override
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-07 17:58:59 +08:00
Wenkai Yin
78aea0920d
Merge pull request #7664 from ywk253100/190507_adapter
Rename the adapter name of docker registry
2019-05-07 17:24:59 +08:00
Steven Zou
2562146faf adjust the order of robot test case of API_DB
Signed-off-by: Steven Zou <szou@vmware.com>
2019-05-07 16:13:31 +08:00
wang yan
ab08a576e4 add multiple manifest intercepetor handler
1, Add a interceptor to block request to upload manifest list
2, Discard notiification without tag.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-05-07 16:10:09 +08:00
Wenkai Yin
d74624d306 Iterate all paginations when listing projects and repositories (#7660)
Iterate all paginations when listing projects and repositories

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 13:34:48 +08:00
Wenkai Yin
4f7fe1452f Add more unit test cases for docker hub adapter
Add more unit test cases for docker hub adapter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 13:32:56 +08:00
Mia ZHOU
09c5f9cfc8
Merge pull request #7663 from pureshine/fix-replication-bug
Fix will not get filter and trigger when switching from push to pull
2019-05-07 13:00:06 +08:00
Wenkai Yin
30b5852b49 Rename the adapter name of docker registry
Rename the adapter name of docker registry to "docker-registry"

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 12:52:34 +08:00
FangyuanCheng
3d43f3fefe Fix wrong data displayed when editing replication rule in a certain sequence.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-07 11:59:05 +08:00
Wenkai Yin
b0e3b65ade Replicate just one image if the media type is manifest list (#7602)
Replicate just one image if the media type is manifest list

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 10:49:10 +08:00
Wenkai Yin
d27a6c0335 Fix a few bugs of replication (#7619)
1. handle the public/private property when creating the projects
2. extend the length of access_secret
3. update the task status by using orm functions

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-05-07 10:47:14 +08:00
jwangyangls
a58fb7086d
Merge pull request #7651 from jwangyangls/updateLibPackage
Update lib/package.json
2019-05-07 10:46:42 +08:00
jwangyangls
42e3a506d9
Merge pull request #7653 from jwangyangls/fix_auth_mode_click_error
Modify auth mode icon to jump to a new page only in OIDC mode
2019-05-07 10:42:48 +08:00
stonezdj(Daojun Zhang)
86bfd7a733 fix issue7637: /api/systeminfo cannot return 500 when DB is down (#7650)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-05-07 10:36:10 +08:00
Fangyuan Cheng
0988a38e84
Merge pull request #7641 from pureshine/cron-validator
Remove the frontend check of cron
2019-05-06 20:52:00 +08:00
Yogi_Wang
783b6e3aea Modify auth mode icon to jump to a new page only in OIDC mode
for 7622: click the icon of auth mode when value is database in configuration page will go to a wrong pagee

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 19:20:33 +08:00
Yogi_Wang
af24cbfa57 Update lib/package.json,update part of dependencies in app/package.json
1.from 6.xxx to 7.xxx
2.update part of dependencies in app/package.json that it eliminate warning when npm install
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 18:30:28 +08:00
Qian Deng
210081604c
Merge pull request #7648 from reasonerjt/rm-index-controller
Remove IndexController
2019-05-06 18:29:14 +08:00
FangyuanCheng
10d96f6a2b Remove validator
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-06 17:14:42 +08:00
Daniel Jiang
45210f7c40 Fix condition for OIDC security filter (#7645)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-06 16:30:09 +08:00
Fangyuan Cheng
26799fc7f4
Merge pull request #7646 from pureshine/fix-replicate-bug
Fix failed to get filter data when switching replication mode
2019-05-06 16:18:46 +08:00
jwangyangls
c22e8008f0
Merge pull request #7618 from jwangyangls/fix_slide_failure_handling
Change request mode specified as API acquisition
2019-05-06 16:06:22 +08:00
Yogi_Wang
a6e1ff33be Change request mode specified as API acquisition
change request mode specified as API acquisition.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-05-06 14:17:29 +08:00
Daniel Jiang
28871b78ae Remove IndexController
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-06 14:04:06 +08:00
FangyuanCheng
0653ab6216 Fix failed to get filter data when switching replication mode
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-05-06 13:22:43 +08:00
Daniel Jiang
6c3df3c8ce Disable CA download when hosted via HTTP
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-05-06 11:14:39 +08:00
Mia ZHOU
f85870511d
Merge pull request #7599 from pureshine/hide-endtime
Display '-' if the end_time does not exist
2019-04-30 14:28:27 +08:00
FangyuanCheng
1b930ad149 Display - if the end_time does not exist
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-30 13:39:17 +08:00
Fangyuan Cheng
0979e56ae5
Merge pull request #7596 from pureshine/add-cron-tip
Add tooltip for cron string
2019-04-30 12:33:00 +08:00
jwangyangls
17b38e395a
Merge pull request #7606 from jwangyangls/fix_delete_repository_and_oidc_add_tooltip
Add OIDC Redirect url and fix delete repository bug and fix operation refresh bug
2019-04-30 12:19:15 +08:00
FangyuanCheng
73e6b8cf56 Add tooltip for cron string
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-30 11:42:55 +08:00
Wenkai Yin
12d58370ad
Merge pull request #7503 from ywk253100/190424_stop_execution
Check the task status of execution whose status is running when deleting the policy
2019-04-30 11:28:49 +08:00
Yogi_Wang
289f2230d7 Add OIDC Redirect url on configration and fix delete repository bug and fix operation refresh bug
1. add OIDC Redirect url on configration.
2. fix delete repository bug.
3. fix operation refresh bug when user Appears when the refresh button is clicked on replicate.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-30 11:06:31 +08:00
Wenkai Yin
e64a71d809
Merge pull request #7594 from wy65701436/fix-gc-log
Fix get log issue of Periodic job
2019-04-30 10:19:17 +08:00
Daniel Jiang
2ca5e04904
Merge pull request #7053 from JoeWrightss/patch-2
Fix some misspells in file
2019-04-29 18:40:00 +08:00
He Weiwei
37a4f1c982 Remove push+pull action (#7571)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-04-29 15:37:10 +08:00
wang yan
02c7cbeec2 Fix get log issue of Periodic job
Use the latest error or success execution as the periodic job log

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-29 15:30:05 +08:00
Wenkai Yin
7e4c227318 Check the task status of execution whose status is running when deleting the policy
Check the task status of execution whose status is running when deleting the policy

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-29 15:04:41 +08:00
Steven Zou
e07e25eeef
Merge pull request #7522 from ywk253100/190426_start_replication
Return immediately after creating the execution record when starting the replication
2019-04-29 15:01:52 +08:00
Daniel Jiang
56c7d55c73
Merge pull request #7593 from reasonerjt/ext-url-systeminfo
Add Ext URL to response of systeminfo API
2019-04-29 14:51:40 +08:00
Wenkai Yin
c53d73775a
Merge pull request #7590 from reasonerjt/oidc-wrong-secret-err
Return more details for error in exchange token
2019-04-29 14:22:37 +08:00
Wenkai Yin
da338806fa
Merge pull request #7583 from ywk253100/190428_replication
Don't fail the process when one tag replication failed
2019-04-29 14:16:07 +08:00
Fangyuan Cheng
cceb624fc2
Merge pull request #7555 from pureshine/loading-filter
Add loading if the fileter is not loaded when creating the replication rule
2019-04-29 13:34:56 +08:00
Daniel Jiang
02cf75c142 Add Ext URL to response of systeminfo API
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-29 13:31:52 +08:00
FangyuanCheng
ab461abe64 Add loading if the fileter is not loaded when creating the replication rule\
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-29 12:44:31 +08:00
Fangyuan Cheng
41e0c5e31a
Merge branch 'master' into fix-vulnerability 2019-04-29 11:32:05 +08:00
Wenkai Yin
c9c2db7c13 Don't fail the process when one tag replication failed
Don't fail the process when one tag replication failed

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-29 10:24:03 +08:00
Steven Zou
f2870272ce add get jobs API to provide powerful job stats management
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-28 22:36:13 +08:00
Fangyuan Cheng
12737bfa7b
Merge branch 'master' into add-loading 2019-04-28 22:23:38 +08:00
FangyuanCheng
1979f3b362 Add loading to the vulnerability page and the gc page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 22:22:28 +08:00
Steven Zou
c9f2bf36eb
Merge pull request #7580 from wy65701436/remove-workaround-500
Remove the workaround for checking chart existence
2019-04-28 21:09:59 +08:00
wang yan
2b99e148d9 Add gc parameters when to update gc schedule
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-28 18:17:08 +08:00
FangyuanCheng
1513f468ae Fix bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-28 17:03:22 +08:00
Fangyuan Cheng
10effb0a02
Merge pull request #7581 from zhoumeina/fix_label_error
fix replication add label console error
2019-04-28 16:24:18 +08:00
Meina Zhou
f4dcac95fe fix replication add label console error
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-28 15:49:28 +08:00
wang yan
b5cb984455 Remove the workaround for checking chart existence
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-28 15:24:17 +08:00
Wang Yan
c26f655bce
add periodic job UUID to upstream job id and use execution log as the… (#7530)
* add periodic job UUID to upstream job id and use execution log as the periodic log

Signed-off-by: wang yan <wangyan@vmware.com>

* add comments to fix codacy

Signed-off-by: wang yan <wangyan@vmware.com>

* Update code per comments

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-28 15:09:56 +08:00
Mia ZHOU
630fa48ac8
Merge pull request #7517 from pureshine/loading-num
Get the number of execution status every 10s and refresh the task list
2019-04-28 14:22:36 +08:00
Mia ZHOU
ae922d86e2
Merge pull request #7521 from pureshine/modify-tip
Modify tooltips for creating replication rule
2019-04-28 14:18:29 +08:00
Wenkai Yin
7af679af7e
Merge pull request #7567 from reasonerjt/oidc-google-refresh-token
Persist the new token in DB after login
2019-04-28 14:12:25 +08:00
Daniel Jiang
80176cc354 Check whether user is nil in Prepare() of users API (#7507)
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-28 14:06:35 +08:00
Daniel Jiang
15626fcae0 Return more details for error in exchange token
This commit update the response off OIDC callback when there's error in exchange token.
Additionally add comments to clarify that by default 500 error will not
contain any details.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-28 13:41:53 +08:00
Wenkai Yin
2a463016a9 Upgrade the distribution and notary library (#7516)
* Return 404 when the log of task doesn't exist

Return 404 when the log of task doesn't exist

Signed-off-by: Wenkai Yin <yinw@vmware.com>

* Upgrade the distribution and notary library

Upgrade the distribution library to 2.7.1, the notary library to 0.6.1

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-28 12:00:26 +08:00
Daniel Jiang
473fed5689 Persist the new token in DB after login
This commit make sure the token is persist to DB after every time after
a user logs in via OIDC provider, to make sure the secret is usable for
the OIDC providers that don't provide refresh token.

It also updates the authorize URL for google to make sure the refresh
token will be returned.

Also some misc refinement included, including add comment to the
OIDC onboarded user, preset the username in onboard dialog.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-27 23:03:59 +08:00
Daniel Jiang
b9f5f1027c
Merge pull request #7504 from reasonerjt/reload-auth-proxy-cert-verify
Update Transport of HTTP cient in auth proxy client
2019-04-26 23:24:33 +08:00
Daniel Jiang
07d15a8553 Update Transport of HTTP cient in auth proxy client
This commit ensures that the TLS config of the HTTP client for auth
proxy is updated when the configuration is changed.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-26 18:39:28 +08:00
Wenkai Yin
621d2f20f3 Return immediately after creating the execution record when starting the replication
When fetching resources is slow, the starting replication request may timeout, this commit returns immediately after creating the execution record when starting the replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-26 13:28:16 +08:00
Wenkai Yin
3c1be645bf
Merge pull request #7456 from yuanshuhan/replication_ng
fix a small issue, that if there is no manifest in huawei image repos…
2019-04-26 11:27:40 +08:00
FangyuanCheng
e45d402777 Modify tooltips for creating replication rule
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-26 10:54:41 +08:00
FangyuanCheng
4768ad33ed Get the number of execution status every 10s and refresh the task list
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 22:01:07 +08:00
Wenkai Yin
6511417ba6
Merge pull request #7495 from stonezdj/const_debts
Replace string with const in metadatalist.go
2019-04-25 17:41:04 +08:00
Mia ZHOU
3296e2acae
Merge pull request #7513 from pureshine/replication-delete
Get delete or replicate failure information directly and display
2019-04-25 17:11:35 +08:00
stonezdj
504eab56c3 Replace string with const in metadatalist.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-25 17:01:43 +08:00
FangyuanCheng
5e34cd3cf9 Fix some issues of replication
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 16:47:31 +08:00
Mia ZHOU
ffadd13ba6
Merge pull request #7487 from pureshine/fix-scan-error
Fix scan task never ends in UI
2019-04-25 12:16:47 +08:00
Mia ZHOU
5a9fa17b0b
Merge pull request #7506 from zhoumeina/fix_gc
use endpoint for gc log
2019-04-25 10:33:25 +08:00
FangyuanCheng
6f055cebc3 Fix Scan task never ends in UI target/1.8.0
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-25 10:27:28 +08:00
Wenkai Yin
7160e411cc
Merge pull request #7498 from ywk253100/190423_docker_hub
Support replicate public repositories from Docker Hub
2019-04-24 17:17:23 +08:00
Meina Zhou
f0d9b41bf5 use endpoint for gc log
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-24 17:04:44 +08:00
Wenkai Yin
66087aac82
Merge pull request #7493 from stonezdj/tech_debts
Remove adminserver in sourcecode
2019-04-24 16:24:59 +08:00
Steven Zou
9bd2de3e35
Merge pull request #7452 from steven-zou/fix_issues_for_jobservice
Fix issues for jobservice
2019-04-24 16:15:43 +08:00
Wenkai Yin
5629bf8546 Support replicate public repositories from Docker Hub
Support replicate the public repositories from Docker Hub without providing the credential

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-24 16:15:31 +08:00
Wenkai Yin
d8da6cb802
Merge pull request #7460 from ywk253100/190419_replication_bug_fix
Fix bug found in replication
2019-04-24 16:12:20 +08:00
jwangyangls
743b3914c3
Merge pull request #7494 from jwangyangls/remove_oidc_ability_to_change_password
Remove OIDC's ability to change passwords
2019-04-24 13:24:54 +08:00
Fangyuan Cheng
24acbcf300
Merge pull request #7485 from pureshine/add-tooltip
Add tooltips for creating replication rule
2019-04-24 13:22:46 +08:00
Mia ZHOU
c4bf07a2ed
Merge pull request #7377 from kofj/fix_history_display
Fix history display
2019-04-24 13:12:14 +08:00
Mia ZHOU
a1230a0ca1
Merge pull request #7490 from pureshine/label-tab
Align all tab spacing between project and configuration pages
2019-04-24 12:45:11 +08:00
Steven Zou
9bcbe2907b fix go vet issues in the code
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-24 07:31:37 +08:00
Wenkai Yin
d8310cc708 Fix replication bugs (#7470)
1. Only return the event based trigger for local Harbor
2. Valid the trigger pattern and cron string when creating/updating policies
3. Set the schema as "http" if it isn't specified when creating/updating registries

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-23 19:34:29 +08:00
Steven Zou
823d9c04a9
Merge pull request #7497 from wy65701436/fix-replc-500
refine chart clint http response
2019-04-23 19:30:36 +08:00
Wenkai Yin
117232c1be Fix bug: cannot update the registry (#7483)
Fix bug: cannot update the registry that has no credential when creating it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-23 18:45:56 +08:00
wang yan
0d563fda9c refine chart clint http response
Chart client eats the http error if not status ok, after refactor, the
real http response will be catched in core api.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 18:22:23 +08:00
Steven Zou
69d9a28860
Merge pull request #7482 from wy65701436/chart-upload
Fix chart upload issue on event based
2019-04-23 17:33:08 +08:00
stonezdj(Daojun Zhang)
e4506604e2 fix error message (#7459)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-23 15:53:34 +08:00
Yogi_Wang
32fc76c666 Remove OIDC's ability to change passwords
remove the ability  to change passwords when user login harbor through OIDC.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-23 15:17:59 +08:00
stonezdj
d7798a12d2 Remove adminserver in sourcecode
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-23 15:05:29 +08:00
疯魔慕薇
d022ad4cd4 1. Add IsSpecificRepositoryName util method. (#7444)
2. Add IsSpecificRepositoryName unit test case.
3. Add Copyright header comment.

Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
2019-04-23 13:37:40 +08:00
FangyuanCheng
85bd840ff1 Align all tab spacing between project and configuration pages
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 11:20:05 +08:00
jwangyangls
1323fbfa14
Merge pull request #7481 from jwangyangls/oidc_generate_cli
Add generate cli secret in user profile page
2019-04-23 11:10:50 +08:00
wang yan
a3763466b3 Update err message to general information
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 10:57:31 +08:00
wang yan
1b4c75af25 Add event into upload ctx
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 10:57:31 +08:00
wang yan
df6e0600c9 Fix chart upload issue on event based
Use chart API to load the uploaded chart file to get the name and version

Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-23 10:57:31 +08:00
Wenkai Yin
ac4dfd5973
Merge pull request #7473 from pureshine/fix-ping-param
Modify some issues of test ping registry and edit registry
2019-04-23 10:13:39 +08:00
Yogi_Wang
f164738246 Add generate cli secret in user profile page
add cli secret button in user profile page, OIDC users can click this button to regenerate a cli secret, if the user does so, then the past cli secret will be abandoned.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-23 10:11:07 +08:00
FangyuanCheng
8cf0d58f1f Modify some issues of test ping registry and edit registry
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 01:31:45 +08:00
FangyuanCheng
1d4a7d8127 Add tooltips for creating replication rule
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-23 00:32:59 +08:00
Steven Zou
ad68a3f79d update the code of other components influenced by the js code change
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-22 22:21:49 +08:00
Steven Zou
3937c8b0dc Merge branch 'master' into fix_issues_for_jobservice 2019-04-22 19:26:51 +08:00
Steven Zou
fae5d1304d add more/refacotr current test cases of job service
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-22 19:24:37 +08:00
Daniel Jiang
1fdc2e6ba9 Provide API to generate CLI secret
This commit provide an API to allow a user that is onboarded via OIDC
authn update his CLI secret.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-22 13:34:12 +08:00
Steven Zou
6f8a80d21c refine the hook event and status update retry approach
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-20 15:00:32 +08:00
Wenkai Yin
aa3b07df69
Merge pull request #7454 from pureshine/fix-duration
Fix failed executions does not show duration
2019-04-20 09:14:16 +08:00
Steven Zou
c6a509b3dd exec dep ensure
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 21:22:37 +08:00
Steven Zou
8e734407c0 Merge branch 'master' into fix_issues_for_jobservice 2019-04-19 21:15:21 +08:00
Steven Zou
ea34bcc950 add retry for status switching
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 21:14:09 +08:00
FangyuanCheng
f2316601d8 Fix duration missed for failed jobs
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-19 17:48:27 +08:00
Wenkai Yin
5c944d98d5 Fix bug found in replication
Call filterResources direclty if resource isn't null in copy flow

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-19 17:32:50 +08:00
Steven Zou
e92164c886
Merge pull request #7442 from ywk253100/190418_replication_bug_fix
Fix bug in replication
2019-04-19 17:04:34 +08:00
stonezdj(Daojun Zhang)
36d13e8243
Merge pull request #7328 from stonezdj/debts
Fix issue 6450 Test LDAP server error without save configuration
2019-04-19 16:51:57 +08:00
Yuan Lei
8205e87d4d fix a small issue, that if there is no manifest in huawei image repository, should return false rather than err
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-04-19 16:16:10 +08:00
Daniel Jiang
6b45b5ef7c
Merge pull request #7451 from reasonerjt/oidc-logout
Skip verifying OIDC token for local user
2019-04-19 14:55:26 +08:00
Steven Zou
38e6df4edb fix code style issues: missing comments
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 14:16:08 +08:00
Steven Zou
f8feaa192e add get scheduled and periodic executions APIs
Signed-off-by: Steven Zou <szou@vmware.com>
2019-04-19 13:54:23 +08:00
Wenkai Yin
cf5cd5902f Fix bug in replication
1. Fix bug when creating the namespace
2. Keep the same logic for hiding access secret
3. Filter only push mode policies for event trigger

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-19 13:34:04 +08:00
Wenkai Yin
3738b0a984
Merge pull request #7439 from wy65701436/pin-error
Pin pkg error version to v0.8.1
2019-04-19 13:16:47 +08:00
Daniel Jiang
5292aea89e Skip verifying OIDC token for local user
If a user does not have OIDC meta data in DB, it means he's not
onboarded via OIDC authn, hence, we should not check the token.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-19 13:07:06 +08:00
Steven Zou
d2c4f19a4c
Merge pull request #7450 from yuanshuhan/replication_ng
add huawei adapter to replication module, and adjust some interface a…
2019-04-19 12:52:21 +08:00
Wenkai Yin
059b75e97c
Merge pull request #7392 from reasonerjt/oidc-logout
Handle OIDC user invalidation from OIDC provider.
2019-04-19 12:46:36 +08:00
Fangyuan Cheng
efca5631fe
Merge pull request #7447 from pureshine/fix-bug
Fix replication tasks page cannot pagination
2019-04-19 12:10:50 +08:00
FangyuanCheng
87c2684724 Fix replication tasks page cannot pagination
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-04-19 11:40:10 +08:00
Yuan Lei
7ee009f1d2 add huawei adapter to replication module, and adjust some interface after testing
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-04-19 10:05:39 +08:00
Daniel Jiang
239b33c5fb Handle OIDC user invalidation from OIDC provider.
Ths commmit ensures that when user's token is invalidated OIDC provider, he
cannot access protected resource in Harbor with the user info in his session.
We share the code path with secret verification b/c the refresh token
can be used only once, so it has to be stored in one place.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-19 01:27:31 +08:00
De Chen
4ce2ba8688 Support image delete in DockerHub adapter (#7422)
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-18 18:24:42 +08:00
De Chen
c3375e4ac2 Fix create ns failure in DockerHub (#7421)
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-18 18:24:28 +08:00
wang yan
d410a964a5 Pin pkg error version to v0.8.1
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-18 17:49:04 +08:00