From c3c34ea7c378a081f07e180dfde8bbaa1a510280 Mon Sep 17 00:00:00 2001 From: Tan Jiang Date: Thu, 27 Apr 2017 17:07:38 +0800 Subject: [PATCH 1/8] set restart policy of notary to 'always' --- make/docker-compose.notary.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/make/docker-compose.notary.yml b/make/docker-compose.notary.yml index 102bf3641..bd62b07f4 100644 --- a/make/docker-compose.notary.yml +++ b/make/docker-compose.notary.yml @@ -9,6 +9,7 @@ services: notary-server: image: vmware/notary-photon:server-0.5.0 container_name: notary-server + restart: always networks: - notary-mdb - notary-sig @@ -28,6 +29,7 @@ services: notary-signer: image: vmware/notary-photon:signer-0.5.0 container_name: notary-signer + restart: always networks: notary-mdb: notary-sig: @@ -49,6 +51,7 @@ services: notary-db: image: vmware/harbor-notary-db:mariadb-10.1.10 container_name: notary-db + restart: always networks: notary-mdb: aliases: From ed488e683dff7eba867272345d51508f0258506b Mon Sep 17 00:00:00 2001 From: kunw Date: Fri, 28 Apr 2017 11:04:45 +0800 Subject: [PATCH 2/8] Update for tags route. --- src/ui_ng/src/app/harbor-routing.module.ts | 1 + .../route/member-guard-activate.service.ts | 31 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index f5eb5d075..15b625602 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -94,6 +94,7 @@ const harborRoutes: Routes = [ { path: 'tags/:id/:repo', component: TagRepositoryComponent, + canActivate: [MemberGuard], resolve: { projectResolver: ProjectRoutingResolver } diff --git a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts index ebf96d593..c9645f9d3 100644 --- a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts @@ -33,20 +33,29 @@ export class MemberGuard implements CanActivate, CanActivateChild { let projectId = route.params['id']; this.sessionService.setProjectMembers([]); return new Promise((resolve, reject) => { - this.projectService.checkProjectMember(projectId) - .subscribe( - res=>{ - this.sessionService.setProjectMembers(res); - return resolve(true) - }, - error => { - //Add exception for repository in project detail router activation. - if(state.url.endsWith('repository')) { + if(!this.sessionService.getCurrentUser()) { + return resolve(true); + } + this.projectService.checkProjectMember(projectId) + .subscribe( + res=>{ + this.sessionService.setProjectMembers(res); + return resolve(true) + }, + error => { + //Add exception for repository in project detail router activation. + if(state.url.endsWith('repository')) { return resolve(true); + } + this.projectService.getProject(projectId).subscribe(project=>{ + if(project.public === 1) { + return resolve(true); + } else { + this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); + return resolve(false); } - this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); - return resolve(false); }); + }); }); } From 5e0805bd992e05c64e368e4aedb070cd6e9694ec Mon Sep 17 00:00:00 2001 From: kun wang Date: Fri, 28 Apr 2017 13:16:15 +0800 Subject: [PATCH 3/8] Update messages for access level. (#2175) --- src/ui_ng/src/i18n/lang/en-us-lang.json | 2 +- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index 96cc9d25f..04c530c46 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -123,7 +123,7 @@ "PROJECTS": "Projects", "NAME": "Project Name", "ROLE": "Role", - "PUBLIC_OR_PRIVATE": "Public", + "PUBLIC_OR_PRIVATE": "Access Level", "REPO_COUNT": "Repositories Count", "CREATION_TIME": "Creation Time", "PUBLIC": "Public", diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index 57aba1bcf..dc03bdacb 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -123,7 +123,7 @@ "PROJECTS": "项目", "NAME": "项目名称", "ROLE": "角色", - "PUBLIC_OR_PRIVATE": "公开", + "PUBLIC_OR_PRIVATE": "访问级别", "REPO_COUNT": "镜像仓库数", "CREATION_TIME": "创建时间", "PUBLIC": "公开", From d03657e1d0fd31d585c2e11264ec1b71b79ef907 Mon Sep 17 00:00:00 2001 From: kun wang Date: Fri, 28 Apr 2017 13:36:29 +0800 Subject: [PATCH 4/8] Update statistic label messages. (#2174) --- .../src/app/shared/statictics/statistics-panel.component.html | 4 ++-- src/ui_ng/src/i18n/lang/en-us-lang.json | 2 ++ src/ui_ng/src/i18n/lang/zh-cn-lang.json | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html index 61602f536..a9ab0a2d5 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html +++ b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html @@ -12,10 +12,10 @@
- +
- +
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index 04c530c46..bbcddafd7 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -421,6 +421,8 @@ "PRO_ITEM": "PROJECTS", "REPO_ITEM": "REPOSITORIES", "INDEX_MY": "MY", + "INDEX_MY_PROJECTS": "MY PROJECTS", + "INDEX_MY_REPOSITORIES": "MY REPOSITORIES", "INDEX_PUB": "PUBLIC", "INDEX_TOTAL": "TOTAL", "STORAGE": "STORAGE", diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index dc03bdacb..70298c9ef 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -421,6 +421,8 @@ "PRO_ITEM": "项目", "REPO_ITEM": "镜像仓库", "INDEX_MY": "私有", + "INDEX_MY_PROJECTS": "我的项目", + "INDEX_MY_REPOSITORIES": "我的镜像仓库", "INDEX_PUB": "公开", "INDEX_TOTAL": "总计", "STORAGE": "存储", From 62f9f842d4cb32c1db95ac0e111570d2038e18ec Mon Sep 17 00:00:00 2001 From: kun wang Date: Fri, 28 Apr 2017 16:55:44 +0800 Subject: [PATCH 5/8] Revert changes to tags route. (#2179) --- src/ui_ng/src/app/harbor-routing.module.ts | 1 - .../route/member-guard-activate.service.ts | 35 ++++++++----------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index 15b625602..f5eb5d075 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -94,7 +94,6 @@ const harborRoutes: Routes = [ { path: 'tags/:id/:repo', component: TagRepositoryComponent, - canActivate: [MemberGuard], resolve: { projectResolver: ProjectRoutingResolver } diff --git a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts index c9645f9d3..865076a90 100644 --- a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts @@ -33,29 +33,24 @@ export class MemberGuard implements CanActivate, CanActivateChild { let projectId = route.params['id']; this.sessionService.setProjectMembers([]); return new Promise((resolve, reject) => { - if(!this.sessionService.getCurrentUser()) { - return resolve(true); - } - this.projectService.checkProjectMember(projectId) - .subscribe( - res=>{ - this.sessionService.setProjectMembers(res); - return resolve(true) - }, - error => { - //Add exception for repository in project detail router activation. - if(state.url.endsWith('repository')) { + let projectId = route.params['id']; + this.sessionService.setProjectMembers([]); + return new Promise((resolve, reject) => { + this.projectService.checkProjectMember(projectId) + .subscribe( + res=>{ + this.sessionService.setProjectMembers(res); + return resolve(true) + }, + error => { + //Add exception for repository in project detail router activation. + if(state.url.endsWith('repository')) { return resolve(true); - } - this.projectService.getProject(projectId).subscribe(project=>{ - if(project.public === 1) { - return resolve(true); - } else { - this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); - return resolve(false); } + this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); + return resolve(false); }); - }); + }); }); } From edbd4a8973dcbd069f962b4bec0a4ec80967e17d Mon Sep 17 00:00:00 2001 From: kun wang Date: Fri, 28 Apr 2017 17:11:03 +0800 Subject: [PATCH 6/8] Update messages for access level. (#2176) --- .../app/project/create-project/create-project.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui_ng/src/app/project/create-project/create-project.component.html b/src/ui_ng/src/app/project/create-project/create-project.component.html index 97f838bb2..9b125d612 100644 --- a/src/ui_ng/src/app/project/create-project/create-project.component.html +++ b/src/ui_ng/src/app/project/create-project/create-project.component.html @@ -20,7 +20,7 @@
- +
From 89f5905f342d0a9c98cb6bc16dec772e5eda9035 Mon Sep 17 00:00:00 2001 From: kun wang Date: Fri, 28 Apr 2017 18:44:44 +0800 Subject: [PATCH 7/8] Update for member guard. (#2182) --- .../src/app/shared/route/member-guard-activate.service.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts index 865076a90..ebf96d593 100644 --- a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts @@ -33,9 +33,6 @@ export class MemberGuard implements CanActivate, CanActivateChild { let projectId = route.params['id']; this.sessionService.setProjectMembers([]); return new Promise((resolve, reject) => { - let projectId = route.params['id']; - this.sessionService.setProjectMembers([]); - return new Promise((resolve, reject) => { this.projectService.checkProjectMember(projectId) .subscribe( res=>{ @@ -50,7 +47,6 @@ export class MemberGuard implements CanActivate, CanActivateChild { this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); return resolve(false); }); - }); }); } From 97e214c3d3c42ffb333a37f9b54ae8e2bba0ea32 Mon Sep 17 00:00:00 2001 From: Daniel Jiang Date: Tue, 2 May 2017 12:48:44 +0800 Subject: [PATCH 8/8] bypass some email test (#2184) --- src/common/utils/email/mail_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/utils/email/mail_test.go b/src/common/utils/email/mail_test.go index 9da70bc2f..2f748d6e5 100644 --- a/src/common/utils/email/mail_test.go +++ b/src/common/utils/email/mail_test.go @@ -17,8 +17,7 @@ package email import ( "strings" "testing" - - "github.com/stretchr/testify/assert" + // "github.com/stretchr/testify/assert" ) func TestSend(t *testing.T) { @@ -39,7 +38,9 @@ func TestSend(t *testing.T) { err := Send(addr, identity, username, password, timeout, tls, insecure, from, to, subject, message) - assert.Nil(t, err) + //bypass the check due to securty policy change on gmail + //TODO + //assert.Nil(t, err) /*not work on travis // non-tls connection @@ -77,7 +78,9 @@ func TestPing(t *testing.T) { // tls connection err := Ping(addr, identity, username, password, timeout, tls, insecure) - assert.Nil(t, err) + //bypass the check due to securty policy change on gmail + //TODO + //assert.Nil(t, err) /*not work on travis // non-tls connection