Commit Graph

377 Commits

Author SHA1 Message Date
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
Daniel Jiang
65ee14bb78 Fix syntax error in swagger.yaml
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-12-16 16:17:19 +08:00
Steven Zou
0cf3793297 doc[compatibility]:add doc ref in the README
- refer the harbor compatibility doc in the README
- add .md suffix to the README file under api/harbor

Signed-off-by: Steven Zou <szou@vmware.com>
2019-12-12 18:43:49 +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
Steven Zou
32b12181e2 doc[api spec]:rename folder name to
Signed-off-by: Steven Zou <szou@vmware.com>
2019-12-09 18:48:10 +08:00
yhua
311cf8da07 change code 20161019 2016-10-21 18:39:10 +08:00
yhua123
ac496e0991 Merge pull request #889 from wemeya/dev
modify log_test.go
2016-10-19 11:58:02 +08:00
Daniel Jiang
3b02134a5c Merge pull request #872 from ywk253100/161012_sync_repo
Do not show repo which has no tag in it
2016-10-17 15:40:27 +08:00
wemeya
95994cd392 modify log_test.go 2016-10-17 13:57:46 +08:00
kunw
9bf08f368c Extend password validation length. 2016-10-14 18:02:13 +08:00
Tan Jiang
7a8912d216 merge with master 2016-10-14 14:23:27 +08:00
Wenkai Yin
44ecac0b4a do not show repo which has no tag in it 2016-10-12 17:35:50 +08:00
Wenkai Yin
769c9c63f1 fix #856 2016-10-11 15:26:03 +08:00
Wenkai Yin
59559561d8 add sqlite support 2016-10-11 13:13:28 +08:00
Penghao Cen
3542c1b66c minor fix log print 2016-10-08 15:37:40 +08:00
wemeya
2a0951e2ea fix test case 2016-09-22 16:57:57 +08:00
wemeya
c0f3d7d749 add test case for user 2016-09-22 16:28:12 +08:00
yhua123
f11e9e8cd0 Merge pull request #813 from zgdxiaoxiao/api-test
add policy api test
2016-09-21 15:29:45 +08:00
Wenkai Yin
2a2a9feee2 fix #761 2016-09-19 17:58:29 +08:00
zgdxiaoxiao
8893f9121d add policy api test
update const data
2016-09-19 16:37:18 +08:00
Daniel Jiang
1c216d902a Merge pull request #804 from reasonerjt/dev
fix #801, add permission check before filtering access log of a project.
2016-09-14 16:05:10 +08:00
Daniel Jiang
e6b3638f9c Merge pull request #803 from ywk253100/buf_fix_filter_repo
bug fix: handle error when checking the existence of repos whose project does not exist in Harbor
2016-09-14 16:04:56 +08:00
Tan Jiang
e5c464f205 fix #801 2016-09-14 15:25:16 +08:00
Wenkai Yin
3f169e113d bug fix: handle error when checking the existence of repos whose project does not exist in Harbor 2016-09-14 15:12:16 +08:00
yhua123
6f5e82f915 Merge pull request #796 from zgdxiaoxiao/api-test
add target api test
2016-09-14 10:11:46 +08:00
Daniel Jiang
bbdf576962 Merge pull request #797 from reasonerjt/dev
Read from DB to refresh catalog cache
2016-09-13 18:51:10 +08:00
Wenkai Yin
343cc4f719 bug fix: delete multiple tags should not return error even though they reference the same image 2016-09-13 18:15:59 +08:00
Tan Jiang
f550fe6a56 Read from DB to refresh catalog cache 2016-09-13 16:13:07 +08:00
zgdxiaoxiao
f340b051d1 add target api test 2016-09-13 16:09:13 +08:00
zgdxiaoxiao
253c242535 add member delete test
add member delete API test

add member and repos test
2016-09-12 17:05:53 +08:00
Wenkai Yin
ce3c3fe8f1 1.search refactor due to storing repositories in database 2.bug fix: filter repositories in project view 2016-09-06 16:25:23 +08:00
Wenkai Yin
0fe8209ae1 the name can be same with others when creating and updating policies 2016-09-05 11:22:12 +08:00
Wenkai Yin
bcdec42346 Improve the performance of database when paginating large records for access logs, jobs and getting the top repositories 2016-09-02 18:35:31 +08:00
yhua123
3a3b4ccecb Merge pull request #750 from zgdxiaoxiao/api-dev
Update api test and swagger.yaml(updated version)
2016-09-02 17:19:53 +08:00
Wenkai Yin
bea2a034af 1.fix bugs in implements of storing repositories in DB 2.Complete project deletion 3.Refactor logic of listing the most favorate repositories 4.Refactor statistics 2016-09-02 16:24:25 +08:00
zgdxiaoxiao
198149599d update api test and swagger.yaml(updated) 2016-09-02 16:05:55 +08:00
Wenkai Yin
569e3aa32f Merge pull request #731 from wy65701436/dev
Add repo into DB, update code per comments
2016-09-01 10:33:50 +08:00
wemeya
44d3875a3f add test code for log and statistic api 2016-08-31 17:01:12 +08:00
zgdxiaoxiao
02d5281f0c project api test and bugfix
1.add project api test
2.bugfix:the type of public in project.go is fixed to int32
2016-08-30 18:26:41 +08:00
yhua
c69fffcca6 merge code 20160830 2016-08-30 13:59:30 +08:00
wy65701436
aba1a33f46 Add repo into DB, update code per comments 2016-08-29 06:21:49 -07:00
Wenkai Yin
c98a7ebd9d Merge branch 'project_deletion' into m_t 2016-08-29 15:26:41 +08:00
Wenkai Yin
a592ed1204 add pagination support for listing projects 2016-08-26 13:51:39 +08:00
Tan Jiang
78c807545d sync master 2016-08-24 13:54:31 +08:00
Wenkai Yin
c546c3a48b support project deletion 2016-08-23 15:56:30 +08:00
Daniel Jiang
2cb2175940 Merge pull request #682 from ywk253100/policy_deletion
Support policy deletion
2016-08-17 16:54:15 +08:00
Daniel Jiang
055a1438d4 Merge pull request #683 from yhua123/master
add new structs from swagger auto gen code
2016-08-15 16:43:17 +08:00
yhua
60cae7357f add new structs from swagger auto gen code 2016-08-15 14:36:42 +08:00
Wenkai Yin
4ef5c1f98a Merge master into dev
Conflicts:
	.travis.yml
	Dockerfile.job
	vendor/vendor.json
2016-08-15 11:30:06 +08:00
Wenkai Yin
ff348be048 1. support policy deletion 2. bug fix: missing semicolon in js 2016-08-12 17:59:25 +08:00
Daniel Jiang
361f6bd393 Merge pull request #679 from ywk253100/master_d
bug fix: check whether project is nil befere reading its properties
2016-08-12 14:39:27 +08:00
Daniel Jiang
13b859f58b Merge pull request #673 from ywk253100/dev_ut
add UT for package utils
2016-08-12 14:38:42 +08:00
Daniel Jiang
71716ef06d fixes #658 2016-08-11 21:38:15 +08:00
Wenkai Yin
3d909bd0bd add UT for package utils 2016-08-11 17:58:17 +08:00
Wenkai Yin
98e399c8fe bug fix: check whether project is nil befere reading its properties 2016-08-11 14:11:45 +08:00
Tan Jiang
c683be1c64 merge with master 2016-08-10 15:34:23 +08:00
yhua
74702a0be7 add api testing framework 2016-08-10 14:34:56 +08:00
Wenkai Yin
5079a8d20c sys admin can not delete himself 2016-08-08 12:42:30 +08:00
Daniel Jiang
4fc9373fec Merge pull request #618 from ywk253100/security_check_on_jobservice
add security check on job service
2016-08-05 14:53:38 +08:00
Wenkai Yin
c4081f9aa3 add security check on job service
update
2016-08-05 13:00:24 +08:00
Tan Jiang
318d10186e Use AES to encrypt password for target 2016-08-04 11:35:52 +08:00
Tan Jiang
fa18ab3a75 merge with master 2016-08-03 17:15:00 +08:00
Wenkai Yin
cf953f74fe return more information when calling get mannifest API
Conflicts:
	api/repository.go
2016-08-02 10:53:53 +08:00
Wenkai Yin
3b827e36f5 support pagination for listing repositories, jobs and access logs
update
2016-08-01 17:54:12 +08:00
Wenkai Yin
82af69d9f6 fix #591 2016-07-31 20:21:19 +08:00
yhua
d746bfc9f2 add *_empty_test.go for actual go test coverage 2016-07-29 18:39:29 +08:00
Daniel Jiang
cf23b067a6 Merge pull request #565 from reasonerjt/master
handle DB error to return 409 when creating project
2016-07-19 15:14:08 +08:00
Tan Jiang
236a54f9bd handle DB error to return 409 when creating project 2016-07-19 13:35:39 +08:00
Wenkai Yin
befc22f3f7 fix #561 2016-07-18 20:37:52 +08:00
Wenkai Yin
3d558b54b4 close connection immediately when it is not used anymore 2016-07-14 18:15:24 +08:00
Wenkai Yin
5011e2de20 Merge pull request #534 from ywk253100/bug_fix
fix #520 #521 #522
2016-07-13 18:11:31 +08:00
Wenkai Yin
f685702475 do not trigger replication if the policy is disabled 2016-07-13 17:19:23 +08:00
Wenkai Yin
67a8c8631a fix #520 #521 #522 2016-07-13 15:51:57 +08:00
Wenkai Yin
37fc63aacc add parameter 'num' to list jobs 2016-07-06 14:12:16 +08:00
Wenkai Yin
2dab2137db add auth check as registry does not distinguish 401 and 403 2016-07-05 12:05:01 +08:00
Daniel Jiang
34a93348a7 Merge pull request #446 from ywk253100/insecure_env
pass insecure env to ui
2016-06-29 19:39:08 +08:00
Wenkai Yin
92193f3456 update 2016-06-29 18:52:24 +08:00
Daniel Jiang
fa7e3b4666 Merge pull request #445 from ywk253100/filter_job_by_time
filter jobs by time
2016-06-29 18:46:50 +08:00
Wenkai Yin
5f75156e1d pass golint 2016-06-29 18:20:53 +08:00
Wenkai Yin
d7f78502d7 pass govet 2016-06-29 18:14:50 +08:00
Wenkai Yin
f31d469758 pass insecure env to ui 2016-06-29 18:09:47 +08:00
Wenkai Yin
2f9ace7eeb update 2016-06-29 17:52:35 +08:00
Wenkai Yin
23b026655c handle repository deletion event in API 2016-06-29 17:10:17 +08:00
Wenkai Yin
60e15cc1fa filter jobs by time 2016-06-29 16:58:16 +08:00
Wenkai Yin
a2b6355fb5 audit deleting repository 2016-06-28 17:33:39 +08:00
Wenkai Yin
1c8cdb8a6b 1.order jobs by create time desc 2.open job log in browser 3.update start time of policy when the policy is enabled 4.do not push manifest if it already exists 2016-06-28 11:06:56 +08:00
Wenkai Yin
10adb7567f filter jobs by status 2016-06-27 16:24:04 +08:00
Wenkai Yin
1c2babda0a move ProjectSorter to package model to avoid package import cycle 2016-06-27 14:46:06 +08:00
wemeya
8af26bb951 add regular expression to check project name 2016-06-24 16:52:08 +08:00
wemeya
f037b23fb8 modify code for test 2016-06-23 18:15:58 +08:00
Wenkai Yin
61a888926e Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into bug_fix_for_access_log
Conflicts:
	api/target.go
2016-06-23 11:17:09 +08:00
Daniel Jiang
9e8256c2d8 Merge pull request #393 from reasonerjt/job-service
propagate more env vars
2016-06-23 11:07:46 +08:00
Tan Jiang
26124d366f propagate more env vars 2016-06-22 18:41:56 +08:00
Wenkai Yin
2da237f8bb bug fix: fixed policy can not be updated 2016-06-22 18:11:47 +08:00
Wenkai Yin
b985c5bed4 1.only target of disabled policy can be modified 2.duplicated policy can not be created 2016-06-22 14:19:19 +08:00
Wenkai Yin
7862bd8033 insecure config 2016-06-22 12:03:50 +08:00
Wenkai Yin
c1a8846a68 1. modify registry client 2. add https support 2016-06-21 16:39:03 +08:00
Wenkai Yin
ba08c24369 bug fix: there's access log generated each time when view the manifest of a repository. 2016-06-20 22:55:36 +08:00
kunw
d9825763cf update for user settings and listing project role. 2016-06-17 15:22:58 +08:00
Wenkai Yin
dbc84dc99b pass golint 2016-06-17 11:44:40 +08:00
Wenkai Yin
7747e72c28 filter jobs by policy ID and repository 2016-06-17 11:34:52 +08:00
Daniel Jiang
dfa8fdb15e Merge pull request #348 from reasonerjt/job-service
add comment to source files
2016-06-16 15:03:53 +08:00
Tan Jiang
d909405c11 add header comment 2016-06-16 14:57:45 +08:00
Wenkai Yin
8939b54448 1. support updating the target of policy 2. can not delete a target if it is being used 2016-06-16 14:18:23 +08:00
Wenkai Yin
836598f5c9 remove useless import 2016-06-15 13:42:19 +08:00
Wenkai Yin
fc8fbbcb98 bug fix: modify the implements of checking whether project name is in lower case 2016-06-15 13:31:00 +08:00
Wenkai Yin
f050c963d5 Merge branch 'bug_fix_for_delete_repo' into sync_image
Conflicts:
	api/repository.go
2016-06-14 18:25:08 +08:00
Wenkai Yin
12a72c0f6c bug fix: deletion of repository which has been deleted should return 404 2016-06-14 18:17:32 +08:00
Wenkai Yin
db9347135c bug fix 2016-06-14 17:33:37 +08:00
Wenkai Yin
81600e8db4 bug fix 2016-06-14 11:14:48 +08:00
Wenkai Yin
14e71f0052 Merge branch 'master' into sync_image
Conflicts:
	.travis.yml
	models/accesslog.go
	models/project.go
	models/user.go
2016-06-13 18:14:41 +08:00
Wenkai Yin
8f56e9fc4a Merge pull request #330 from ywk253100/sync_image
add modify policy
2016-06-13 17:54:05 +08:00
Wenkai Yin
bc0aa21441 add modify policy 2016-06-13 17:32:22 +08:00
Wenkai Yin
32857a9154 Merge pull request #329 from ywk253100/sync_image
filter policies by name and project ID
2016-06-13 16:57:43 +08:00
Wenkai Yin
39edccf549 filter policies by name and project ID 2016-06-13 16:49:46 +08:00
Wenkai Yin
784947a787 Merge pull request #328 from ywk253100/sync_image
Sync image
2016-06-13 14:40:25 +08:00
Wenkai Yin
cf7ee9a327 update implements of FilterTargets() 2016-06-13 14:24:13 +08:00
Wenkai Yin
e5fe595f62 add test for FilterTargets() 2016-06-13 08:42:11 +08:00
Wenkai Yin
3bc41cc6d3 filter targets by name 2016-06-13 08:31:32 +08:00
wemeya
0147ec8d3b Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-07 20:35:24 +08:00
wemeya
fbb26634a7 change code for travis ci 2016-06-06 23:47:27 +08:00
shixi_weimeng
8459fcf7dc change code for review 2016-06-06 23:07:17 +08:00
wemeya
411ead21fc change code for review 2016-06-06 17:53:36 +08:00
Wenkai Yin
4fbe18cb03 pass golint 2016-06-06 17:46:19 +08:00
Wenkai Yin
e8cad0f9f3 pass golint 2016-06-06 17:42:16 +08:00
Wenkai Yin
f4e6d048b2 add validation to create, update policies and targets 2016-06-06 17:31:47 +08:00
wemeya
15ee62485f Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-06 16:35:59 +08:00
wemeya
e985a587c2 modify as travis CI required 2016-06-02 19:15:23 +08:00
wemeya
26d7f77532 modify as travis CI required 2016-06-02 19:10:53 +08:00
Wenkai Yin
10cf76a682 try to stop replication when a policy is disabled 2016-06-02 18:17:00 +08:00
wemeya
eb62beba31 modify merge conflicts 2016-06-02 17:57:39 +08:00
wemeya
389a6037d5 change code as the review reqired 2016-06-02 17:33:10 +08:00
root
d66a8f913e merge master 2016-06-02 13:41:52 +08:00
wemeya
267152f8e6 change code according to review 2016-06-01 19:29:08 +08:00
wemeya
ccbe297bba change code according to travis CI 2016-06-01 18:12:06 +08:00
wemeya
c972406d0f change code 2016-06-01 18:02:32 +08:00
wemeya
9b5cb57d2a change code according to travis CI 2016-06-01 17:57:33 +08:00
wemeya
af55312664 change code for review 2016-06-01 17:51:06 +08:00
wemeya
4d4ab9e408 Merge remote-tracking branch 'upstream/master' 2016-06-01 17:02:02 +08:00
wemeya
ffd58c0f2d add api to list top 10 repos 2016-06-01 17:01:43 +08:00
Daniel Jiang
03389abb96 Merge pull request #298 from reasonerjt/api-attributes
update attributes of api
2016-06-01 15:43:52 +08:00
Tan Jiang
bf86f1ff58 update attributes of api 2016-06-01 15:17:05 +08:00
Wenkai Yin
610566fe73 Merge branch 'master' into sync_image 2016-06-01 15:10:52 +08:00
Wenkai Yin
8c6ea744c2 modify test codes of registry client to pass test 2016-06-01 15:09:10 +08:00
Wenkai Yin
297e5c4a44 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-06-01 13:50:19 +08:00
Wenkai Yin
07c7ce403c bug fix: the length should be 0 when initialize a slice 2016-06-01 13:47:23 +08:00
Tan Jiang
bd223796b4 fix issue in travis 2016-06-01 13:28:02 +08:00
wemeya
498d2e629a change code according to review 2016-06-01 12:27:26 +08:00
wemeya
0aade05222 change code according to comment 2016-05-31 17:38:51 +08:00