Commit Graph

764 Commits

Author SHA1 Message Date
Wenkai Yin
94787ea60d Bump up the version of legacy APIs to v2.0
Bump up the version of legacy APIs to v2.0

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-02-14 13:16:30 +08:00
Wenkai Yin(尹文开)
d66c1a4a21
Merge pull request #10612 from ywk253100/200202_replication_basic_auth
Do enhancement for the registry authorizer
2020-02-11 22:09:40 +08:00
Wenkai Yin
a4ebbc6ecf Do enhancement for the registry authorizer
This commit introduces a new wrapper authorizer which can authorize the request according to the auth scheme automatically

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-02-11 21:21:49 +08:00
danfengliu
d1b5bd5d9c Fix project quotas API test issue
In project quotas API test, pull images from goharbor namespace instead of library:
1. Replace image source in API test;
2. Modify criteria for verify project configuration modification.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-02-06 16:43:08 +08:00
danfengliu
a7472a7a66
Merge pull request #10614 from danfengliu/fix-test-steps-desc-in-robot-account-api-test
Fix description of test in robot account API test
2020-02-04 20:07:14 +08:00
danfengliu
66eff99c7f Fix description issue of test in robot account API test and issue of Helm3 test
1. Fix issue that test step descriton was mismatch with test step;
2. Wrong helm command was used in Helm3 test, replace helm with helm3;
3. In API test, images were pulled from docker-hub registry, images size changed sometime, so we like to use internal registry.

Signed-off-by: danfengliu <danfengl@vmware.com>
2020-02-04 17:26:52 +08:00
Wenkai Yin
ef3af85a5b Register registry handler with the new methods of Route
Register registry handler with the new methods of Route

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-02-03 16:55:08 +08:00
Daniel Jiang
2064a1cd6d Switch to basic authentication for registry
1. Add basic authorizer for registry which modify the request
to add basic authorization header to request based on configuration.
2. Set basic auth header for proxy when accessing registry
3. Switche the registry to use basic auth by default and use the basic
authorizer to access Harbor.
4. Make necessary change to test cases, particularly
"test_robot_account.py" and "docker_api.py", because the error is
changed after siwtched to basic auth from token auth.  #10604 is opened
to track the follow up work.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-01-31 21:46:47 +09:00
Wenkai Yin(尹文开)
a1b25e1fec
Switch to new registry API handlers (#10596)
Switch to new registry API handlers

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2020-01-30 21:21:07 +08:00
Daniel Jiang
5f8acc3896 Add middlewares for permission checking for v2 API
When the registry shifts from token auth to basic auth, we'll use the middleware to check permission.
This commit add middlewares for populate the artifact info and check
permission based on request to /v2/* api via security context

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2020-01-27 12:53:15 +08:00
Ziming Zhang
9f1d538b5f feat(cicd): try fix sometimes docker push time out
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I67193a7c5b80d169237a884895627f68a1f65933
2020-01-20 11:57:03 +08:00
Daniel Jiang
c4dd6c077e
Merge pull request #10456 from bitsf/stop_travis
feat(cicd):stop use travis
2020-01-18 02:59:41 +08:00
Ziming Zhang
45113ea8e1 feat(cicd) use a smaller docker image for test
Change-Id: Ie8f365e7271bfda24ae965aaca0e55d1099c1d68
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-01-17 13:09:31 +08:00
Danfeng Liu (c)
d9c0a4ae67 Switch registry from docker-hub ot internal harbor registry
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
:q
2020-01-17 10:43:20 +08:00
Ziming Zhang
e4eec83e21 feat(cicd):stop use travis
Change-Id: I8a979e4c63801c70ea0b520c864131901ab39506
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2020-01-15 18:16:03 +08:00
Ziming Zhang
a8e99ef7be fix(cicd) Use fixed golang version 1.13.4 and fail early
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ic6a5930c879e3d344ce8a747e226514b4500324c
2020-01-14 16:35:26 +08:00
Danfeng Liu (c)
d02f15fb0f Add retry for prject list display
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2020-01-13 15:44:31 +08:00
Danfeng Liu (c)
ea01a236a5 Add retry when fail to find replication
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2020-01-08 17:08:42 +08:00
danfengliu
7edac6d8e8
Merge pull request #10403 from danfengliu/add-test-case-tag-immutability
Add nightly test case for tag immutability
2020-01-07 14:04:19 +08:00
Daniel Jiang
a5f8111fd0
Merge pull request #10329 from wy65701436/expir-robot
add expiration data time when to create a robot account
2020-01-06 17:30:48 +08:00
Danfeng Liu (c)
9d651128d6 Add nightly test case for tag immutability
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2020-01-06 15:54:08 +08:00
Danfeng Liu (c)
07b005bcda add checkpoint and retry for click add member button
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2020-01-03 15:40:46 +08:00
wang yan
a0f3709b3c add expiration data time when to create a robot account
Update API of creating robot accout, user can specify expiration time per account.

Signed-off-by: wang yan <wangyan@vmware.com>
2020-01-03 13:47:06 +08:00
Danfeng Liu (c)
1cdf7253cd Repull image when error
Docker pull command was enclosed to one keyword, in this keyword,
there're retry and log record.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-31 14:30:26 +08:00
danfengliu
bbe40a551e
Merge pull request #10374 from danfengliu/refresh-project-quotas-list
Refresh project quotas list at regular time
2019-12-30 17:03:53 +08:00
danfengliu
79f93af471
Merge pull request #10333 from danfengliu/add-time-waiting-for-tag-switch
Replace keyword without waiting to one which had waiting
2019-12-30 14:45:24 +08:00
Danfeng Liu (c)
9dbb04925c Refresh project quotas list at regular time
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-30 14:11:19 +08:00
danfengliu
de2ec7d063 Replace keyword without waiting to one which had waiting
1. Replace all keywords without using waiting;
2. Add a debug line in Go Into Repo for UI hung trouble shooting.

Signed-off-by: danfengliu <danfengl@vmware.com>
2019-12-27 17:13:25 +08:00
danfengliu
933dc91ba5 Notary test failed in Helm Pipeline
In Helm pipeline, harbor access address is by domain name instead of IP, so cert directory should be created by domain name.

Signed-off-by: danfengliu <danfengl@vmware.com>
2019-12-27 17:02:28 +08:00
danfengliu
d46b663778 Remove whitelist verifcation since it's not ready
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-12-27 10:24:45 +08:00
Danfeng Liu (c)
76cbcfcbb9 Refect upgrade script, population will be distinguished by harbor version.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-26 14:08:47 +08:00
danfengliu
95ddf6d9b3 Refect keyword of Go Into Reop
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-12-24 16:39:37 +08:00
Wenkai Yin(尹文开)
c1522d3c36
Merge pull request #10261 from stonezdj/20191211_ldap_group_admin_dn
Fix admin permission not revoked when removed from LDAP admin group(Do Not Merge)
2019-12-24 14:37:28 +08:00
stonezdj
6313a55219 Fix admin permission not revoked when removed from LDAP admin group
Seperate the HasAdminRole(In DB) with the privileges from external auth, and use user.HasAdminPrivilege to check

Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-12-20 13:12:22 +08:00
Danfeng Liu (c)
8bfc5d12c3 Change parameter image to optional
1. Change parameter in Keyword Body Of Admin Push Signed Image to an
optional one.
2. Loose the restriction for Quotas error message verification.
3. Get cert for notary from API instead of local file.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-19 16:54:59 +08:00
danfengliu
99713dbec6
Merge pull request #10302 from danfengliu/switch-repository-filter-in-nightly-test-case
Use repository filter in the list above
2019-12-18 16:51:16 +08:00
danfengliu
66859d35d8
Merge pull request #10299 from danfengliu/add-remove-notary-signature-nightly-testcase
Add notary remove signature test case in nightly
2019-12-18 16:50:57 +08:00
Danfeng Liu (c)
70a40b87a8 Use repository filter in the list above
Nigthly test case failures always caused by filter issue, as Shijun
adviced, it's better to use  repository filter in the list above.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-18 13:50:49 +08:00
Danfeng Liu (c)
9961d8b0d6 O
Add notary remove signature test case in nightly

1. Update E2E image Dockerfile for adding notary CLI;
2. Add test case of remove notary signature.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-17 21:00:08 -08:00
Ziming
e32649adb4 enhance[cicd] introduce github action for CICD
In order to replace travis.
Implement 5 CI jobs
- UTTEST
- APITEST_DB
- APITEST_LDAP
- OFFLINE
- UI_UT

Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-12-17 18:36:33 +08:00
Danfeng Liu (c)
364df7a767 Modify robot keyword from press key to press keys
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-12 17:01:31 +08:00
danfengliu
6d80803dbb
Merge pull request #10091 from danfengliu/update-e2e-dockerfile-to-latest
Maintain E2E image Dockerfile
2019-12-12 14:04:53 +08:00
Danfeng Liu (c)
fb80ef9cb9 Update E2E image Dockerfile
1. update and docker-compose;
2. Install helm and helm3.
3. dockerd-entrypoint.sh has been modify by commit image manually, so it should be updated.
4. Keyword <Get Matching Xpath Count> is no longer recommended in
library Selenium2Library. After Dockerfile is updated and image is going
to be rebuiled, library Selenium2Library has be updated to 3.0.0, but
not 1.8.0, so keyword must be upgraded.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-12 10:31:15 +08:00
Steven Zou
7bf9372f32 chore[api]:rename API folder to api
- update swagger yaml file reference in `Makefile`
- update swagger yaml file reference in `README`
- update swagger yaml file reference in `docs/configure_swagger.md`
- update swagger yaml file reference in `make/photon/portal/Dockerfile`
- update swagger yaml file reference in `tests/swaggerchecker.sh`

Signed-off-by: Steven Zou <szou@vmware.com>
2019-12-11 17:41:27 +08:00
Wang Yan
2a63382236
Merge pull request #10047 from bitsf/makefile_clean
optimize the makefile process
2019-12-05 19:03:19 +08:00
Ziming Zhang
332f88ec8c add make clean
Change-Id: Ibe806972a19cd69bfd90be051cdc340c4d7c6afb
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-12-05 14:44:07 +08:00
Wenkai Yin(尹文开)
d145f4baf4
Merge pull request #10034 from ywk253100/191128_clean
Clean up admiral-related code
2019-12-04 17:33:31 +08:00
Danfeng Liu (c)
7dbe84d9c6 1. Add nightly test case of Robot-Account; 2. In Go Into Repo keyword, filter element should not be clicked since list in loading state, so add some sleep and waiting for the cirlce icon is gone; 3. Move read-only test case in the end of common.robot.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-12-03 14:46:54 +08:00
Danfeng Liu (c)
156b1b0687 As we like to use a local registry for nightly quotas test, so that the sample image will not be update without noticed, so modify quotas test case to use local image for pulling.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-29 14:56:41 +08:00
Yogi_Wang
97e08c50c9 refactor project tab
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-29 12:02:08 +08:00
Wenkai Yin
dd2bc0ecef Clean up admiral-related code
Clean up admiral-related code as it's useless

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-11-28 17:28:54 +08:00
Will Sun
6c7ef36e60
Merge pull request #10005 from AllForNothing/remove-lib
Move lib into src for better UI building
2019-11-28 09:47:18 +08:00
danfengliu
82b7e02baf
Merge pull request #10018 from danfengliu/add-loop-for-waiting-completion-of-replication
[Nightly Test]Add a replication scope keyword for waiting the completion of replication result
2019-11-27 17:51:37 +08:00
Will Sun
a52b99e180
Merge branch 'master' into remove-lib 2019-11-27 17:44:30 +08:00
Danfeng Liu (c)
1698cc034a Add a replication scope keyword for waiting the completion fo replication result. All replication test case must use this keyword to verify if image was pulled.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-27 15:51:03 +08:00
Daniel Jiang
f25bacc5bc
Merge pull request #10010 from wy65701436/upgrade-golang-1.13
Bump up golang version to v1.13.4
2019-11-27 10:35:35 +08:00
sshijun
c692f5c67e Move lib into src for better UI building
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-27 09:59:06 +08:00
wang yan
7b664f64f1 Bump up golang version to v1.13.4
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-26 19:18:45 +08:00
Danfeng Liu (c)
b7bd34d181 It's a temporary solution for quotas case, after internal registry in service, image size will not change any longer.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-26 15:27:50 +08:00
danfengliu
6d382bdb18
Merge pull request #9982 from danfengliu/add-restrict-xpath-for-go-into-project
Modify keyword Go Into Project and Quota case
2019-11-25 18:09:50 +08:00
Danfeng Liu (c)
f0750f73de 1. Add element verification for keyword Go Into Project; Make big loop effective by stop assert in keyword Retry Double Keywords When Error; 2. Quota string verification is too restrictive, make it loose a little.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-25 17:44:15 +08:00
Wang Yan
4121545e46
Merge pull request #9972 from wy65701436/cp-9967
inject base image version tag when to build offline package
2019-11-25 14:35:13 +08:00
wang yan
b2b8fd1806 udpate base image to 1.10.0
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-22 16:47:32 +08:00
Danfeng Liu (c)
08bedb8376 Add a big loop for keyword Go Into Project to make sure if project was not found, search it again
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-22 15:04:22 +08:00
Danfeng Liu (c)
b8a7598ffa The criteria of keyword Go Into Project is not strong for verify if it's in project repositroy page, so fix this issue by way of 'Retry Double Keywords When Error'.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-22 12:07:20 +08:00
Wang Yan
abfd634644
Merge pull request #9935 from wy65701436/enable-migrator-master
enable build migrator in master
2019-11-21 18:51:36 +08:00
Danfeng Liu (c)
6e1f560544 Modify 2 points, 1st is add wait time right after scan all; 2nd is add name length for project name to avoid naming repeatly.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-21 15:12:21 +08:00
wang yan
e5bd87ec5d enable build migrator in master
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-20 14:59:35 +08:00
Wang Yan
5c16cbc7b6
Merge pull request #9922 from wy65701436/push-online
upload online installer with drone
2019-11-19 17:53:22 +08:00
wang yan
17f126c5f7 upload online installer with drone
1, upload online installer and signature
2, inject npm registry server when to build offline

Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-19 17:01:31 +08:00
Danfeng Liu (c)
44b9a8d70a The xpath of repository filter behavior may cause hung-up of repositoy search operation, so change it by the filter in the list column.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-19 14:52:56 +08:00
Danfeng Liu (c)
1a6d9536d6 As the background of clair updated was disabled, and we populate clair db right after harbor deployed with existing data, so all clair relevant test cases should be update as the data of this clair population.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-15 18:08:38 +08:00
Daniel Jiang
2fcd174e4b
Merge pull request #9828 from wy65701436/cii-docker-base
add base images when to build harbor assets
2019-11-15 14:24:11 +08:00
Yogi_Wang
e951ceb31c Modify scan now nightly case
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-13 10:09:03 +08:00
wang yan
47793e77e3 update base file name ane pass base version to build file
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-12 19:12:49 +08:00
sshijun
14364727ae Nightly case for tag-retention
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-11 16:58:33 +08:00
Yogi_Wang
58936aae42 Modify nightly case of scanner
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-11 13:19:37 +08:00
Daniel Jiang
890dcb915e Bump up Clair to v2.1.0
This commit fixes #9677

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-06 14:16:02 +08:00
Steven Zou
4b335b79d5
Merge pull request #9693 from steven-zou/fix/issue_#9606_update_API_swagger
update API swagger file
2019-11-06 11:06:02 +08:00
Steven Zou
0ebeaa10df update API swagger file
- add scanners mgmt related API
- add scan related API
  - trigger scan
  - get report
  - get log text stream
  - get scan all metrics
- update the scan_overview in the tag getting API
- fix #9606

Signed-off-by: Steven Zou <szou@vmware.com>
2019-11-05 22:20:14 +08:00
Wang Yan
27cb25cc04
Merge pull request #9400 from ninjadq/inject_certs_to_non_root
Inject certs to non root
2019-11-05 14:49:08 +08:00
Wang Yan
5961c4d72a
Merge pull request #9625 from ywk253100/191028_e2e
Add e2e test case for health check API
2019-11-05 14:34:36 +08:00
Wang Yan
3f39b0ba4f
Merge pull request #9550 from ninjadq/enable_https_by_default
Enable https by default
2019-11-04 16:51:33 +08:00
DQ
a0462f0baa Change the clair container to non root user
Signed-off-by: DQ <dengq@vmware.com>
2019-11-04 11:36:39 +08:00
danfengliu
e28aae0c90
Merge pull request #9685 from danfengliu/replication-dest-url-changed
Modify nightly test case due to replication rule element is modified from selector to input
2019-11-01 15:23:45 +08:00
Danfeng Liu (c)
d8c49d9834 Replication rule element is modified from selector to input, so nightly test case should be updated.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-01 13:08:47 +08:00
Will Sun
1c8105e837
Merge pull request #9663 from AllForNothing/nav-modify
Modify harbor-shell UI
2019-11-01 10:26:54 +08:00
sshijun
b4fa143aa4 Modify harbor-shell UI
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-01 09:31:33 +08:00
DQ
873d9f5b82 Enable https by default
1. Umcomment https related configs
2. Remove the https prepare related thing in ci

Signed-off-by: DQ <dengq@vmware.com>
2019-10-31 20:58:09 +08:00
Wang Yan
fa784d7514
Merge pull request #9649 from wy65701436/fix-9081
add ldflags for harbor compiler and linker
2019-10-31 19:14:16 +08:00
Steven Zou
7b6e83090e create API folder to keep API swagger files
- create API folder
- move harbor API swagger file to API/harbor
- add scanner adapter open API swagger file to API/scanner
- update protal build Dockerfile
- update swagger explorer build command in Makefile

Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-30 21:41:03 +08:00
wang yan
253e87d186 inject ldflags for harbor compiler and linker
1, replace the UIVERSION file with ldflags, which is generarted by make to inject into the UI core.
2, inject additional ldflags for harbor compiler

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-30 18:31:42 +08:00
Wenkai Yin
e20b538141 Add e2e test case for health check API
Add e2e test case for health check API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-10-29 13:48:06 +08:00
Danfeng Liu (c)
76c5cb85ec Before user keyword Enable Self Reg, explore should be opened and navigate to harbor log in page.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-28 17:24:07 +08:00
Danfeng Liu (c)
afdf262ca6 In nightly test case of project members, xpath locator of remove a member is not strong enough for location, it used index of elemment, so it should be update by the meaning of the btn.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-28 14:52:24 +08:00
Steven Zou
5c4c04a122
Merge pull request #9602 from heww/upgrade-clair-adapter
Upgrade clair adapter to v1.0.0
2019-10-28 12:19:28 +08:00
jwangyangls
e8554b9d66
Merge pull request #9587 from jwangyangls/add-webhook-tests-1.10
Add webhook nightly case
2019-10-28 10:05:16 +08:00
He Weiwei
28e0c0693b Upgrade clair adapter to v1.0.0
1. Upgrade clair adapter to v1.0.0.
2. Make the clair adapter which installed by harbor immutable and using internal registry address.
3. Add support to build clair adapter image from binary.
4. Switch to ScannerPull action when make authorization for the scan request.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-26 17:25:36 +00:00
Yogi_Wang
988279cdcb Add webhook nightly case
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-25 15:25:32 +08:00
Ziming Zhang
7de8ce7472 add gpg sign
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I32d13be2f5b5f383113582a4b1ad5f74bdc7546b
2019-10-24 11:38:38 +08:00