Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-27 21:12:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10902 from jwangyangls/fix-xsrf-422

Browse Source 
Fix xsrf error status bug when after beego update
This commit is contained in:
jwangyangls 2020-03-03 15:38:07 +08:00 committed by GitHub
commit 0d45308fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/portal/src/app/intercept-http.service.spec.ts
View File

@ -24,7 +24,7 @@ describe('InterceptHttpService', () => {
return of(new HttpResponse({status: 200}));
} else {
return throwError(new HttpResponse( {
status: 403
status: 422
}));
}
}
@ -48,7 +48,7 @@ describe('InterceptHttpService', () => {
(service: InterceptHttpService) => {
mockCookieService.set("fdsa|ds");
service.intercept(mockRequest, mockHandle).subscribe(res => {
if (res.status === 403) {
if (res.status === 422) {
expect(btoa(mockRequest.headers.get("X-Xsrftoken"))).toEqual(cookie.split("|")[0]);
} else {
expect(res.status).toEqual(200);

2
src/portal/src/app/intercept-http.service.ts
View File

@ -14,7 +14,7 @@ export class InterceptHttpService implements HttpInterceptor {
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<any> {
return next.handle(request).pipe(catchError(error => {
if (error.status === 403) {
if (error.status === 422) {
let Xsrftoken = this.cookie.get("_xsrf") ? atob(this.cookie.get("_xsrf").split("|")[0]) : null;
if (Xsrftoken && !request.headers.has('X-Xsrftoken')) {
request = request.clone({ headers: request.headers.set('X-Xsrftoken', Xsrftoken) });