Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 18:55:18 +01:00
Code Issues Projects Releases Wiki Activity
7,396 Commits 48 Branches 317 Tags 353 MiB
bf9ac08c89
Commit Graph

3097 Commits

Author SHA1 Message Date
Iradier, AlvaroJose
bf9ac08c89 Handle error on OIDC callback 
If wrong OIDC scopes are defined, or there are some configuration errors, the OIDC callback query string might contain "error=..." with an error message. Intercept this case and show an error to the user instead of trying to exchange the token with a missing "code" parameter.

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>

Change error variable name

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>
 2019-08-30 13:44:12 +02:00
Daniel Jiang
93f86e321b
Merge pull request #8903 from wy65701436/fix-8807 
fix #8807
 2019-08-30 18:23:05 +08:00
Wenkai Yin(尹文开)
8c67f71b5e
Merge pull request #8902 from wy65701436/fix-8888 
fix #8888
 2019-08-30 18:09:56 +08:00
wang yan
c28920c84f fix #8807 
Format the error of mount blob, return a http error so that the core can parse it.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-30 16:29:47 +08:00
wang yan
dd9f028fe0 fix #8888 
the image may has the same blobs as the references, which causes the artifact & blobs
can not be inserted by unique constraint

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-30 15:30:05 +08:00
Wang Yan
240b718508
Merge pull request #8887 from wy65701436/fix-8886 
fix(quota/sync) #8886
 2019-08-30 15:06:35 +08:00
Ziming Zhang
22e7f22b30 tag retention fix duration and show trigger 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I7f93dd4c1b93b8d7e6b2c2a14fd4ccf128945def
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-30 11:48:11 +08:00
Wenkai Yin(尹文开)
881884786d
Merge pull request #8883 from bitsf/tag_retention_log 
enhance tag retention log
 2019-08-30 10:48:01 +08:00
Ziming Zhang
247ef1b884 enhance tag retention log 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id5946c2dd53868fdd5f5abbcca45e453bc9ba4fd
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 18:40:00 +08:00
wang yan
16b910e1cf fix(quota/sync) #8886 
The foreign layer won't be counted into project quota
NOTE: the foreign layer will be dumped from the registry in the migration

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-29 17:29:40 +08:00
Ziming Zhang
8fb6e2f65b verify permission of GetRetentionExecTaskLog 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I4bf4ddf3d3ed6f07a4618e242e2f3774996716d6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 15:01:53 +08:00
Wang Yan
db5781bf78
Merge pull request #8860 from wy65701436/fix-quota-sync 
fix quota sync issues
 2019-08-29 13:45:38 +08:00
wang yan
5decb56369 update code per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-29 12:46:42 +08:00
Wang Yan
03309680ff
Merge pull request #8873 from bitsf/tag_retention_log_time 
show empty if time is 0
 2019-08-29 12:39:22 +08:00
Daniel Jiang
9fa70db866
Merge pull request #8867 from bitsf/tag_retention_same_digest_tag 
Tag retention same digest tag
 2019-08-29 12:26:44 +08:00
Wenkai Yin(尹文开)
5da4286ef4 Hard delete project metadata (#8856) 
Hard delete project metadata

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-29 12:14:39 +08:00
Ziming Zhang
57a34a7d8d show empty if time is 0 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I5acc13714dbb1dc1d8bf3f1c6c620a7d54f86910
 2019-08-29 12:10:22 +08:00
Ziming Zhang
6137065eba prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I527ec87f48348c6607b1c9529c90f5ad804bd8f6
 2019-08-29 10:21:13 +08:00
Mia ZHOU
9a4627c583
Merge pull request #8863 from jwangyangls/add-endpoint-id 
Add  id in endpoint url
 2019-08-29 09:30:13 +08:00
Will Sun
fb66d58334
Merge pull request #8864 from AllForNothing/master 
remove whitespaces when add tag-retention rule
 2019-08-29 08:56:52 +08:00
wang yan
942e793f20 fix quota sync issues 
1, fix #8858, add retry to ping backend service
2, fix #8859, split the blobs data when larger then 65535

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-28 18:59:25 +08:00
Ziming Zhang
4248f7a45e prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I37a3ef0d4cff7214e35076453494d89f0ad84d43
 2019-08-28 18:27:35 +08:00
Ziming Zhang
8290af6d25 prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ie5f77db58e71636cd9aaf322bb3f83a0090f8877
 2019-08-28 18:24:55 +08:00
Ziming Zhang
063f2bfee9 prevent retained tag with same digest deleted by other tag 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I6a69b405b454ca0350677204e06bfa2b24616b33
 2019-08-28 17:48:42 +08:00
AllForNothing
16163f08c6 remove whitespaces when add tag-retention rule 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-28 17:31:57 +08:00
Yogi_Wang
21b59ab2a3 Add id in endpoint url 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-28 17:10:29 +08:00
Qian Deng
ed54b1da45
Merge pull request #8857 from wy65701436/fix-syne-readonly 
fix quota sync read only setting
 2019-08-28 17:04:02 +08:00
He Weiwei
2c1c816941
fix(database): generate db url by url.URL for schema upgrade (#8852) 
Closes #7948

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-28 16:59:22 +08:00
Ziming
94138137d5
add valid for rule (#8846) 
Change-Id: I82215a0cf1ec32a253c8db9bfafe7e25b26c9ad9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-28 16:58:49 +08:00
wang yan
19a37282c1 fix quota sync read only setting 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-28 14:53:01 +08:00
jwangyangls
81c1e9892a
Merge pull request #8831 from jwangyangls/add-pleaseholder-hub 
Add placeholder in registry page when select helm-hub
 2019-08-28 13:40:01 +08:00
Wang Yan
6045a69457
Merge pull request #8853 from wy65701436/fix-pb-dao 
fix sql in remove blob from project
 2019-08-28 11:09:19 +08:00
Wang Yan
87893abc5e
Merge pull request #8829 from ywk253100/190822_retry_status 
Add status revision to handle retrying in replication task
 2019-08-28 10:55:13 +08:00
wang yan
19f543a025 fix sql in remove blob from project 
the project id is missing in the method, that makes GC to clean all of items,
and if quota will not compute twice for the existing manifest.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-28 00:38:11 +08:00
Qian Deng
ea33561d95
Merge pull request #8747 from 928234269/patch1 
fixt typo "an user" to "a user"
 2019-08-27 18:26:11 +08:00
Wang Yan
be1e702d9d
Merge pull request #8787 from cd1989/core-hunging 
Fix core hung when stop problem
 2019-08-27 15:56:21 +08:00
Wang Yan
39f78ae768
Merge pull request #7872 from cd1989/config-redis-pool-idletimeout 
Config idle timeout for redis pool to avoid jobservice restarting
 2019-08-27 14:46:01 +08:00
Wenkai Yin
7924f37d86 Add status revision to handle retrying in replication task 
Add status revision to handle retrying in replication task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-27 14:17:11 +08:00
Yogi_Wang
5c8a683645 Add placeholder in registry page when select helm-hub 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-27 12:00:44 +08:00
Wenkai Yin(尹文开)
7262cc4c1a
Merge pull request #8836 from wy65701436/update-quota-error 
Revise quota errors to make it more readable
 2019-08-27 11:34:36 +08:00
Will Sun
c4baa75c9d
Merge pull request #8834 from AllForNothing/tag-imp 
Improvement for rule validator of tag-retention
 2019-08-27 10:45:10 +08:00
jwangyangls
86ae7d65e5
Merge pull request #8830 from jwangyangls/tag-detail-scan-show-result 
Show the result about vulnerabilities number and vunerability list when click scan button
 2019-08-27 10:23:55 +08:00
wang yan
f343b2ec45 Revise quota errors to make it more readable 
1, fix #8802, update the error formet
2, fix #8807, raise the real retag error to UI
3, fix #8832, raise the real chart error to chart client & ut

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-26 17:00:31 +08:00
wang yan
e3155e00d6 fix #8815 :add remove untagged blob record in table project_blob 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-26 15:57:19 +08:00
Shijun Sun (c)
ab6232e2de Improvement for rule validator of tag-retention UI and modify for errer message 
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
 2019-08-26 15:33:15 +08:00
Yogi_Wang
b3341f3f8b Show the result about vulnerabilities number and vunerability list when click scan button 
we do not change the existing logic.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-26 10:50:49 +08:00
Steven Zou
a80969e7af fix rule logic bug described in #8817 (#8818) 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-08-23 18:49:44 +08:00
Ziming Zhang
52b9fbc8f3 fix tag retention model verify 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ifb237bbed4c6d7272ace62da7603e027c1481aef
 2019-08-23 15:48:33 +08:00
Wang Yan
e7488e37b6
Merge pull request #8788 from bitsf/tag_retention_validate_model 
add tag retention model test
 2019-08-23 13:57:51 +08:00
Ziming Zhang
39db65e90f add tag retention model test 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f8b06b994024fe6052b0dee87600ed932edaaff
 2019-08-23 13:24:28 +08:00