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

don't try cert auth when password manager auto-fills form #547

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

don't try cert auth when password manager auto-fills form #547

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ From project Root:
1. Then in a separate window run & watch changes in the main application **app-ziti-console**

```bash
ng build ziti-console-node --watch
ng build ziti-console --watch --base-href=/zac/
```

This ensures changes made to the NPM library get pulled into the Angular app as you are developing
Expand Down
179 changes: 134 additions & 45 deletions projects/app-ziti-console/src/app/login/controller-login.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
import {Injectable, Inject} from '@angular/core';
import {HttpClient} from "@angular/common/http";
import {LoginServiceClass, SettingsServiceClass, GrowlerService, GrowlerModel, SETTINGS_SERVICE} from "ziti-console-lib";
import {firstValueFrom, lastValueFrom, Observable, ObservableInput, of, switchMap, tap} from "rxjs";
import {lastValueFrom, Observable, of, switchMap} from "rxjs";
import {catchError} from "rxjs/operators";
import {Router} from "@angular/router";
import moment from "moment";
import {debounce, defer, isEmpty, isNil} from "lodash";
import {defer, isEmpty, isNil} from "lodash";

@Injectable({
providedIn: 'root'
Expand Down Expand Up @@ -68,50 +67,140 @@ export class ControllerLoginService extends LoginServiceClass {
});
}

observeLogin(serviceUrl: string, username?: string, password?: string) {
const queryParams = username && password ? '?method=password' : '?method=cert';
const requestBody = username && password ? { username, password } : undefined;
const endpoint = serviceUrl + '/authenticate';

return this.httpClient.post(endpoint + queryParams, requestBody, {
headers: {
"content-type": "application/json",
}
})
.pipe(
switchMap((body: any) => {
return this.handleLoginResponse.bind(this)(body, username, password)
}),
catchError((err: any) => {
let errorMessage, growlerData;
if (err.code === "ECONNREFUSED") {
errorMessage = `Server Not Accessible. Please make sure controller is online.`;
growlerData = new GrowlerModel(
'error',
'Error',
`Login Failed`,
errorMessage,
);
} else {
const status = err?.statusText;
const code = '- ' + (err?.error?.code || status);
errorMessage = `Unable to login to selected edge controller ${code}. Please make sure the selected controller is online and accessible`;
growlerData = new GrowlerModel(
'error',
'Error',
`Login Failed`,
errorMessage,
);
this.router.navigate(['/login']);
observeLogin(serviceUrl: string, username?: string, password?: string): Observable<any> {
return new Observable(observer => {
let checkForInputsInterval: number | null = null;
let timeoutId: number | null = null;

const setupInputListeners = (usernameInput: HTMLInputElement, passwordInput: HTMLInputElement) => {
console.log('Login inputs found');

// Detect autofill using MutationObserver
const detectAutofill = () => {
const observer = new MutationObserver(() => {
const isUsernameFilled = usernameInput.value.length > 0;
const isPasswordFilled = passwordInput.value.length > 0;
if (isUsernameFilled && isPasswordFilled) {
console.log('Autofill detected via MutationObserver');
observer.disconnect();
triggerLogin(usernameInput, passwordInput);
}
});

observer.observe(usernameInput, { attributes: true, childList: true, characterData: true });
observer.observe(passwordInput, { attributes: true, childList: true, characterData: true });

// Fallback: Periodically check for filled inputs
const checkInterval = setInterval(() => {
const isUsernameFilled = usernameInput.value.length > 0;
const isPasswordFilled = passwordInput.value.length > 0;
if (isUsernameFilled && isPasswordFilled) {
console.log('Autofill detected via interval check');
clearInterval(checkInterval);
observer.disconnect();
triggerLogin(usernameInput, passwordInput);
}
}, 500); // Check every 500ms
};

const triggerLogin = (usernameInput: HTMLInputElement, passwordInput: HTMLInputElement) => {
const detectedUsername = usernameInput.value || username || '';
const detectedPassword = passwordInput.value || password || '';

console.log(`Login attempted - Username: "${detectedUsername}", Password: ${detectedPassword ? '[REDACTED]' : 'empty'}`);

const queryParams = detectedUsername && detectedPassword ? '?method=password' : '?method=cert';
const requestBody = detectedUsername && detectedPassword ? { username: detectedUsername, password: detectedPassword } : undefined;
const endpoint = serviceUrl + '/authenticate';

console.log(`Authentication method: ${queryParams.includes('password') ? 'password' : 'cert'}`);

this.httpClient.post(endpoint + queryParams, requestBody, {
headers: {
"content-type": "application/json",
}
}).pipe(
switchMap((body: any) => {
return this.handleLoginResponse.bind(this)(body, detectedUsername, detectedPassword);
}),
catchError((err: any) => {
let errorMessage, growlerData;
if (err.code === "ECONNREFUSED") {
errorMessage = `Server Not Accessible. Please make sure controller is online.`;
growlerData = new GrowlerModel(
'error',
'Error',
`Login Failed`,
errorMessage,
);
} else {
const status = err?.statusText;
const code = '- ' + (err?.error?.code || status);
errorMessage = `Unable to login to selected edge controller ${code}. Please make sure the selected controller is online and accessible`;
growlerData = new GrowlerModel(
'error',
'Error',
`Login Failed`,
errorMessage,
);
this.router.navigate(['/login']);
}
if (this.settingsService?.settings?.session) {
this.settingsService.settings.session.id = undefined;
}
this.settingsService.set(this.settingsService.settings)
this.growlerService.show(growlerData);
throw({error: errorMessage});
})
).subscribe(
result => observer.next(result),
error => observer.error(error),
() => observer.complete()
);
};

detectAutofill();
};

const checkForInputs = () => {
console.log('Checking for login inputs...');
const usernameInput = document.querySelector('input[type="text"], input[type="email"], input[name="username"]') as HTMLInputElement;
const passwordInput = document.querySelector('input[type="password"]') as HTMLInputElement;

if (usernameInput && passwordInput) {
console.log('Login inputs found:', usernameInput, passwordInput);
if (checkForInputsInterval !== null) {
clearInterval(checkForInputsInterval);
}
if (this.settingsService?.settings?.session) {
this.settingsService.settings.session.id = undefined;
if (timeoutId !== null) {
clearTimeout(timeoutId);
}
this.settingsService.set(this.settingsService.settings)
this.growlerService.show(growlerData);
throw({error: errorMessage});
})
);
setupInputListeners(usernameInput, passwordInput);
} else {
console.log('Login inputs not found yet');
}
};

checkForInputsInterval = window.setInterval(checkForInputs, 100); // Check every 100ms

// Timeout after 10 seconds
timeoutId = window.setTimeout(() => {
if (checkForInputsInterval !== null) {
clearInterval(checkForInputsInterval);
}
console.error('Login inputs not found after 10 seconds. DOM structure:', document.body.innerHTML);
observer.error(new Error('Login inputs not found after 10 seconds'));
}, 10000);

return () => {
if (checkForInputsInterval !== null) {
clearInterval(checkForInputsInterval);
}
if (timeoutId !== null) {
clearTimeout(timeoutId);
}
};
});
}

private handleLoginResponse(body: any, username: string, password: string): Observable<any> {
Expand Down