github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

(UI): Add endpoint check to TauriHttpInterceptor for non-API requests

Browse Source
This commit is contained in:
Alexandr Stelnykovych
2025-06-19 17:26:52 +03:00
parent 95838b510c
commit f7dd9825be
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/angular/projects/safing/portmaster-api/src/lib/platform-specific/tauri/tauri-http-interceptor.ts
View File

@@ -1,6 +1,8 @@
import { HttpEvent, HttpHandlerFn, HttpRequest, HttpResponse, HttpHeaders, HttpErrorResponse } from '@angular/common/http'; import { HttpEvent, HttpHandlerFn, HttpRequest, HttpResponse, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
import { from, Observable, switchMap, map, catchError, throwError } from 'rxjs'; import { from, Observable, switchMap, map, catchError, throwError } from 'rxjs';
import { invoke } from '@tauri-apps/api/core' import { invoke } from '@tauri-apps/api/core'
import { inject } from '@angular/core';
import { PORTMASTER_HTTP_API_ENDPOINT } from '../../portapi.service';
/** /**
* TauriHttpInterceptor intercepts HTTP requests and routes them through Tauri's `@tauri-apps/plugin-http` API. * TauriHttpInterceptor intercepts HTTP requests and routes them through Tauri's `@tauri-apps/plugin-http` API.
@@ -15,6 +17,13 @@ import { invoke } from '@tauri-apps/api/core'
* - https://angular.dev/guide/http/interceptors * - https://angular.dev/guide/http/interceptors
*/ */
export function TauriHttpInterceptor(req: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> { export function TauriHttpInterceptor(req: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> {
const httpApiEndpoint = inject(PORTMASTER_HTTP_API_ENDPOINT);
if (httpApiEndpoint && !req.url.startsWith(httpApiEndpoint)) {
// If the request URL does not start with the configured HTTP API endpoint, skip interception
console.log('[TauriHttpInterceptor] Non-API request, skipping interception:', req.url);
return next(req);
}
const fetchOptions: RequestInit = { const fetchOptions: RequestInit = {
method: req.method, method: req.method,
headers: req.headers.keys().reduce((acc: Record<string, string>, key) => { headers: req.headers.keys().reduce((acc: Record<string, string>, key) => {