Wenkai Yin
3436729d52
Merge pull request #4547 from ywk253100/180328_schedule_replication_job
...
Move schedule replication job to new jobservice
2018-03-30 21:03:45 +08:00
Steven Zou
ba91fc2861
Merge master into job_service and fix conflicts
2018-03-30 19:26:04 +08:00
Wenkai Yin
dd40f187ec
Move schedule replication job to new jobservice
2018-03-30 17:44:05 +08:00
Yan
892d9bf023
bypass docker client retry on push in readonly mode ( #4524 )
2018-03-29 23:49:00 -07:00
Steven Zou
d1899c840d
Merge branch 'master' into job_service
2018-03-29 23:25:20 +08:00
Tan Jiang
5dd75bb0b0
Trust Root CA of VIC appliance when accessing Admiral
2018-03-29 19:53:41 +08:00
Wenkai Yin
55035ada2d
Merge pull request #4490 from ywk253100/180326_label
...
Delete the mapping relationship between resources and labels when the label is deleted
2018-03-28 14:38:01 +08:00
wangyan
01487b8221
Add readonly into systeminfo
2018-03-27 04:29:20 -07:00
yixingj
cb64ad96ff
Make endpoint configurable
...
Move all the endpoint to harbor.cfg
2018-03-26 10:50:18 +08:00
Wenkai Yin
dd156ca243
Handle replication job status hook
2018-03-24 21:18:58 +08:00
Wenkai Yin
1fea594c3d
Trigger replication job from UI with new jobservice
2018-03-24 18:10:50 +08:00
Tan Jiang
0abf53c112
fix golint
2018-03-27 21:30:37 +08:00
Tan Jiang
be97a91650
Integrate with jobservice webhook
2018-03-27 21:27:52 +08:00
Tan Jiang
c859616e25
fix golint and go vet issue
2018-03-26 22:10:01 +08:00
Tan Jiang
582deea9e7
resolve conflict
2018-03-26 18:11:39 +08:00
Tan Jiang
41ce0891ab
Trigger scan job from UI.
2018-03-26 18:07:21 +08:00
Wenkai Yin
38568a1d2c
Merge pull request #4485 from ywk253100/180326_period_job
...
Create a job to call UI's replication API to do the period replication job
2018-03-26 17:31:10 +08:00
Tan Jiang
745b21abbc
Merge remote-tracking branch 'upstream/master' into scan-job-migrate
2018-03-26 15:39:42 +08:00
Tan Jiang
381ecc3521
Merge with master
2018-03-26 10:37:17 +08:00
Wenkai Yin
85f357ec6b
Delete the mapping relationship between resources and labels when the label is deleted
2018-03-24 02:22:51 +08:00
Wenkai Yin
e63d5a1c06
Create a job to call UI's replication API to do the period replication job
2018-03-23 23:53:15 +08:00
Wenkai Yin
ed08a42e4b
Migrate replication job to the new jobservice
2018-03-23 18:36:37 +08:00
Yan
cbcca015b0
add read only mode to stop docker push ( #4433 )
2018-03-23 03:16:08 -07:00
Yan
5edbd00318
Revise harbor build version ( #4445 )
2018-03-21 13:03:49 +08:00
Wenkai Yin
838b439560
Implement filter repository and tags by label API
2018-03-21 10:51:06 +08:00
Wenkai Yin
a7a72f78bd
Return role and repository count info in GET project API
2018-03-20 19:09:06 +08:00
Daniel Jiang
cbedf099b5
Merge pull request #4342 from yixingjia/apimonitor
...
Add monitor API for Harbor components
2018-03-16 14:56:58 +08:00
yixingj
4255ed167a
Add monitor API for Harbor components.
...
1>AdminServer.
2>UI.
2018-03-15 10:39:55 +08:00
stonezdj
44fc373c6d
Add LDAP Group Search Configure Param
2018-03-15 06:16:47 +08:00
Daniel Jiang
0efd8e3c54
Merge pull request #4396 from ywk253100/180309_label_resource
...
Implement adding/removing labels to/from repositories and images API
2018-03-14 14:15:31 +08:00
Wenkai Yin
bcf81224ad
Update according to the comments
2018-03-14 13:42:19 +08:00
Wenkai Yin
36b9c4e458
Implement adding/removing labels to/from repositories and images API
2018-03-12 19:30:05 +08:00
Tan Jiang
b81b55b0c1
Extend the length of project name in request validation
2018-03-12 16:07:06 +08:00
Wenkai Yin
379f113452
Implement label management API
2018-03-09 12:17:27 +08:00
Tan Jiang
2f2bc7f3ef
add ut
2018-03-01 18:52:09 +08:00
Tan Jiang
3a5bff1615
Refine error returned by Authenticator
...
There has been inconsistency in terms of the error returned by
authenticator.
This commit introduces an error ErrAuth to explicitly flag an
authentication failure, which should be treated as user error such
as "invalid credentials", and other errors will be treated as system error.
2018-03-01 18:19:46 +08:00
stonezdj
f138067242
Refactor project member
2018-02-09 10:38:51 +08:00
Tan Jiang
40b6cb0d43
Return UAA error to Security Context layer
2018-02-05 21:00:19 +08:00
Wenkai Yin
10f56d26fe
Change codes to make everything OK after upgrading to beego 1.9.0
2018-02-05 13:07:52 +08:00
Wenkai Yin
9022abfc13
Fix code issues found by Gas
2018-01-29 15:17:03 +08:00
Tan Jiang
e9b656ce79
Fix Nil pointer issue in login function
2018-01-24 14:49:03 +08:00
Wenkai Yin
515cac010a
Merge pull request #4071 from ywk253100/180117_policy_pagination
...
Add pagination support in listing replication policy API
2018-01-19 15:19:45 +08:00
Wenkai Yin
69fa18c881
Merge pull request #4059 from ywk253100/180117_job_status
...
Support multiple status in query string of replication job listing API
2018-01-18 18:05:08 +08:00
Wenkai Yin
611709a7be
Add pagination support in listing replication policy API
2018-01-18 15:54:12 +08:00
stone
c815dc01dd
Merge pull request #4043 from reasonerjt/uaa-bugfix
...
Read Email from UAA while onboarding user.
2018-01-18 14:04:35 +08:00
Wenkai Yin
9ec8b4d634
Support multiple status in query string of replication job listing API
2018-01-17 17:07:10 +08:00
Tan Jiang
d5d913f51d
Read Email from UAA while onboarding user.
...
Will call the userinfo API of UAA to get user info and generage user
model based on the response. Also this commit include a change that
whenever the UAA Client is to be used it will update the configuraiton,
this is needed as we enable user to update the configuration of UAA via
UI.
2018-01-17 10:28:49 +08:00
Wenkai Yin
7ebcc82516
Fix bug: checking whether the status is null when listing replication jobs
2018-01-16 19:25:18 +08:00
Wenkai Yin
53d5a2256a
Propagate registry storage driver name to adminserver and return it in /api/systeminfo
2018-01-16 16:57:28 +08:00
Daniel Jiang
a9fe5564df
Merge pull request #4011 from ywk253100/180112_fix_404
...
Handle /harbor/* with IndexController to fix UI 404 Page Not Found error
2018-01-15 17:10:43 +08:00
Tan Jiang
bc1366c3e5
Enable user to edit UAA settings on UI
2018-01-14 11:47:45 +08:00
Tan Jiang
d6bf0ea11d
Remove data generated by dao_test after the test.
2018-01-12 15:56:30 +08:00
Wenkai Yin
27b4197459
Handle /harbor/* with IndexController to fix UI 404 Page Not Found error
2018-01-12 15:48:42 +08:00
Daniel Jiang
43afd426bb
Merge pull request #3995 from reasonerjt/admin-rename
...
Provide API to rename admin
2018-01-12 13:59:13 +08:00
stone
ec173305a3
Merge pull request #3974 from stonezdj/ldap_ping_timeout
...
Setting timeout for ldap ping
2018-01-12 11:22:27 +08:00
Tan Jiang
a392a8dc29
Provide API to rename admin
...
This is to provide a workaround for very corner case that in user's
authentication backend (LDAP, UAA) has a user called "admin" and because
Harbor's super user is hard coded to "admin" it's not possible to login
the "admin" with credentials in LDAP or UAA.
To minimize the impact, we'll provide an internal API for user to update
the super user's username from "admin" to "admin@harbor.local", this API
can be called by "admin" only, and is not reversible.
2018-01-11 23:01:06 +08:00
stonezdj
c48c7f7b6a
Setting timeout for ldap ping
2018-01-10 15:14:30 +08:00
Wenkai Yin
e26b442c9c
Merge pull request #3951 from ywk253100/180104_replicate_interval
...
Manual starting replication will be rejected if there are pending/running jobs
2018-01-10 10:56:45 +08:00
Wenkai Yin
7da89ec39b
Passing tag as a parameter or the value will be overwritten
2018-01-08 15:23:35 +08:00
Daniel Jiang
f8af1f275e
Merge pull request #3911 from stonezdj/ldap_search_level
...
Ambiguous UI and internal values ldap_scope
2018-01-08 14:53:55 +08:00
Daniel Jiang
093e2bead2
Merge pull request #3950 from ywk253100/180105_ut
...
Add unit test for adding description of repository
2018-01-08 14:32:10 +08:00
Wenkai Yin
87ce1c84d5
Manual starting replication will be rejected if there are pending/running jobs
2018-01-05 17:05:57 +08:00
Wenkai Yin
487c248227
Add unit test for adding description of repository
2018-01-05 16:52:48 +08:00
stonezdj
26b86984d2
Ambiguous UI and internal values ldap_scope #3764
2018-01-05 15:51:37 +08:00
pfh
13308ce9d8
Merge remote-tracking branch 'upstream/master' into repEnhance
2018-01-05 14:09:03 +08:00
Wenkai Yin
51297cdfd7
Merge pull request #3887 from ywk253100/171227_ssrf
...
Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs
2018-01-04 18:11:47 +08:00
Daniel Jiang
8e5115c832
Merge pull request #3870 from stonezdj/ldap_syncuser2
...
Sync user email in ldap #3663
2018-01-04 13:28:51 +08:00
Wenkai Yin
3448fd9a2d
Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs
2018-01-04 12:26:17 +08:00
Tan Jiang
e02de2068a
Enable configuring the CA Certificate for UAA
...
Enable configuring the path of root cert of UAA in harbor.cfg. It only
takes effects if the verify_cert is set to "true" If the file does not
exist, the configuration is skipped.
The intention for this commit is to support integration with nested UAA
in PAS or PKS, we don't expect user to manually configure this value,
though he can do it if he wants.
2018-01-03 16:21:29 +08:00
Wenkai Yin
96a63c56b1
Merge remote-tracking branch 'upstream/master' into 180103_merge
2018-01-03 10:32:03 +08:00
Daniel Jiang
5289ff8d5a
Merge pull request #3888 from stonezdj/ldap_security2
...
Do not display internal error message to user
2017-12-29 16:49:53 +08:00
Tan Jiang
cae581979b
Return UAA settings in configuration API
...
All the UAA settings will be read only as we expect user to modify it
via opsman instead of Harbor UI.
2017-12-28 11:30:18 +08:00
stonezdj
fba68ed000
Do not display internal error message to user
2017-12-27 19:22:17 +08:00
stonezdj
35716dedd3
Sync user email in ldap #3663
2017-12-26 18:53:32 +08:00
stonezdj
9f99d0400c
Call EscapeFilter for filter to avoid security issue
2017-12-26 15:34:14 +08:00
Tan Jiang
da20e4f11c
Search UAA when adding member to a project.
...
1)Enable UAA client to search UAA by calling '/Users' API.
2)Implement 'SearchUser' in UAA auth helper, register it to auth
package.
2017-12-26 00:25:32 +08:00
Wenkai Yin
3be1d5a7fd
Assign read-only privilege of replication policy to project admin and add stopping replication jobs API.
2017-12-25 23:49:21 +08:00
yixingj
08a1b45b72
Add test case for Clair DB configuration
...
Add test case for validate Clair DB config
2017-12-21 11:39:53 +08:00
yixingjia
fa67e11680
Merge pull request #3831 from yixingjia/HA_Clair
...
Make Clair DB configurable
2017-12-21 11:31:26 +08:00
Daniel Jiang
60d2204f33
Merge pull request #3840 from ywk253100/171220_desc
...
Allow project developer to edit repository description
2017-12-21 02:17:58 +08:00
Tan Jiang
12cd733678
Remove useless code from UI router and API
...
Some URLs are not used on UI, so they are removed. And the validation
code of API is removed as we use the security context approach.
fix test issue
2017-12-20 23:10:38 +08:00
yixingj
f63588855f
Make Clair DB configurable
...
Make the HOST,PORT,USERNAME,DB configurable for
Clair
2017-12-20 18:29:50 +08:00
Daniel Jiang
052521b92c
Merge pull request #3821 from reasonerjt/uaa-restriction
...
Refactor the configuraiton of UAA
2017-12-19 19:36:09 +08:00
Daniel Jiang
c0c262cb53
Merge pull request #3790 from ywk253100/171214_author
...
Read image author from label 'maintainer' if author is null
2017-12-19 18:40:25 +08:00
Tan Jiang
2ffc58a5d4
Refactor the configuraiton of UAA
...
Remove the attribute "uaa_ca_root" from harbor.cfg and introduce
"uaa_verify_cert". Similar to LDAP settings, this allow user to
explicitly turn of the cert verification against UAA server, such that
the code will work with self-signed certificate.
2017-12-19 14:42:07 +08:00
Tan Jiang
224f75b9a6
Refactor /users API, add more restircation in password reset
...
Simplified the code when checking if a user is modiable in different
auth modes.
Also add restriction in password, such that when the auth mode is not DB
auth, only the super user can choose to reset his password.
2017-12-18 14:32:29 +08:00
Wenkai Yin
42c9c439f9
Allow project developer to edit repository description
2017-12-15 20:30:39 +08:00
stonezdj
9393d26fdc
Fix ldap ping issue #3653
2017-12-15 14:47:54 +08:00
Wenkai Yin
d9b0f54c5e
Split populating author as a method and add unit test
2017-12-15 10:40:24 +08:00
Wenkai Yin
a736cb7b09
Update the HTTP client according to the comments
2017-12-15 09:40:31 +08:00
Wenkai Yin
c4dc95f4f9
Add implement for supporting replicatie the existing images now
2017-12-15 09:40:31 +08:00
Wenkai Yin
b5e7de331e
Delete enabled and start_time properties of replication rule
2017-12-15 09:40:31 +08:00
Wenkai Yin
055ab0ba15
Refine replication schedule trigger API
2017-12-15 09:40:31 +08:00
Wenkai Yin
fe10c2e7f5
Create replicator to submit replication job to jobservice
2017-12-15 09:40:31 +08:00
Wenkai Yin
8b4fdfc2cc
Add unit tests for replication related methods
2017-12-15 09:40:31 +08:00
Wenkai Yin
c5ccb7e53c
Enable filter chain in replication
2017-12-15 09:40:30 +08:00
Wenkai Yin
a384325a1e
Publish replication notification for manual, scheduel and immediate trigger
2017-12-15 09:40:30 +08:00
Wenkai Yin
a54b7dd4c0
Merge remote-tracking branch 'upstream/master' into 171219_merge
2017-12-15 08:48:57 +08:00
Wenkai Yin
745d83e393
Read image author from label 'maintainer' if author is null
2017-12-13 23:28:01 +08:00
Tan Jiang
5da894bcf2
Small refactory.
2017-12-13 20:58:27 +08:00