Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set cookies sameSite to strict and use secure cookies #4877

Merged
merged 1 commit into from
Feb 6, 2020
Merged

Set cookies sameSite to strict and use secure cookies #4877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions src/app/frontend/common/services/global/authentication.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {KdStateService} from './state';

@Injectable()
export class AuthService {
private readonly config_ = CONFIG;
private readonly _config = CONFIG;

constructor(
private readonly cookies_: CookieService,
Expand All @@ -54,20 +54,36 @@ export class AuthService {

private setTokenCookie_(token: string): void {
// This will only work for HTTPS connection
this.cookies_.set(this.config_.authTokenCookieName, token, null, null, null, true);
this.cookies_.set(this._config.authTokenCookieName, token, null, null, null, true, 'Strict');
// This will only work when accessing Dashboard at 'localhost' or
// '127.0.0.1'
this.cookies_.set(this.config_.authTokenCookieName, token, null, null, 'localhost');
this.cookies_.set(this.config_.authTokenCookieName, token, null, null, '127.0.0.1');
this.cookies_.set(
this._config.authTokenCookieName,
token,
null,
null,
'localhost',
true,
'Strict',
);
this.cookies_.set(
this._config.authTokenCookieName,
token,
null,
null,
'127.0.0.1',
true,
'Strict',
);
}

private getTokenCookie_(): string {
return this.cookies_.get(this.config_.authTokenCookieName) || '';
return this.cookies_.get(this._config.authTokenCookieName) || '';
}

removeAuthCookies(): void {
this.cookies_.delete(this.config_.authTokenCookieName);
this.cookies_.delete(this.config_.skipLoginPageCookieName);
this.cookies_.delete(this._config.authTokenCookieName);
this.cookies_.delete(this._config.skipLoginPageCookieName);
}

/**
Expand All @@ -79,7 +95,7 @@ export class AuthService {
.pipe(
switchMap((csrfToken: CsrfToken) =>
this.http_.post<AuthResponse>('api/v1/login', loginSpec, {
headers: new HttpHeaders().set(this.config_.csrfHeaderName, csrfToken.token),
headers: new HttpHeaders().set(this._config.csrfHeaderName, csrfToken.token),
}),
),
)
Expand Down Expand Up @@ -115,7 +131,7 @@ export class AuthService {
'api/v1/token/refresh',
{jweToken: token},
{
headers: new HttpHeaders().set(this.config_.csrfHeaderName, csrfToken.token),
headers: new HttpHeaders().set(this._config.csrfHeaderName, csrfToken.token),
},
);
}),
Expand Down Expand Up @@ -150,7 +166,15 @@ export class AuthService {

skipLoginPage(skip: boolean): void {
this.removeAuthCookies();
this.cookies_.set(this.config_.skipLoginPageCookieName, skip.toString());
this.cookies_.set(
this._config.skipLoginPageCookieName,
skip.toString(),
null,
null,
null,
true,
'Strict',
);
}

/**
Expand All @@ -159,6 +183,6 @@ export class AuthService {
* In case cookie is not set login page will also be visible.
*/
isLoginPageEnabled(): boolean {
return !(this.cookies_.get(this.config_.skipLoginPageCookieName) === 'true');
return !(this.cookies_.get(this._config.skipLoginPageCookieName) === 'true');
}
}
10 changes: 9 additions & 1 deletion src/app/frontend/common/services/global/localsettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ export class LocalSettingsService {
}

updateCookie_(): void {
this.cookies_.set(this.cookieName_, JSON.stringify(this.settings_));
this.cookies_.set(
this.cookieName_,
JSON.stringify(this.settings_),
null,
null,
null,
true,
'Strict',
);
}
}