Ecosystem/monerod-gui
1
0
Fork 0
mirror of https://github.com/everoddandeven/monerod-gui.git synced 2024-12-22 11:39:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ban list settings

Browse source
This commit is contained in:
everoddandeven 2024-11-14 17:23:12 +01:00
parent 546b810e3c
commit b1ed2e6a6d
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/pages/settings/settings.component.html
View file

@ -71,7 +71,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="form-check form-switch col-md-6"> <div class="form-check form-switch col-md-6">
<label for="general-remote-ban-list" class="form-check-label">Remote ban list</label> <label for="general-remote-ban-list" class="form-check-label">Remote ban list</label>
<input class="form-control form-check-input" type="checkbox" role="switch" id="general-remote-ban-list" [checked]="currentSettings.remoteBanList" [(ngModel)]="currentSettings.remoteBanList" [ngModelOptions]="{standalone: true}"> <input class="form-control form-check-input" type="checkbox" role="switch" id="general-remote-ban-list" [checked]="remoteBanList" [(ngModel)]="remoteBanList" [ngModelOptions]="{standalone: true}">
<br> <br>
<small class="text-body-secondary">Specify a remote URL for download ban list</small> <small class="text-body-secondary">Specify a remote URL for download ban list</small>
</div> </div>
@ -79,7 +79,7 @@
<br> <br>
<div *ngIf="!currentSettings.remoteBanList" class="col-md-12"> <div *ngIf="!remoteBanList" class="col-md-12">
<label for="general-ban-list-file" class="form-label">Ban list file</label> <label for="general-ban-list-file" class="form-label">Ban list file</label>
<div class="input-group mb-3"> <div class="input-group mb-3">
<input id="general-ban-list-file" type="text" class="form-control form-control-sm" placeholder="" aria-label="Ban list file path" aria-describedby="basic-addon3" [value]="currentSettings.banList" readonly> <input id="general-ban-list-file" type="text" class="form-control form-control-sm" placeholder="" aria-label="Ban list file path" aria-describedby="basic-addon3" [value]="currentSettings.banList" readonly>
@ -89,7 +89,7 @@
<small class="text-body-secondary">Specify ban list file, one IP address per line. It is <strong>not recommended</strong> to statically ban any IP addresses unless you absolutely need to. Banning IPs often excludes the most vulnerable users who are forced to operate entirely behind Tor or other anonymity networks</small> <small class="text-body-secondary">Specify ban list file, one IP address per line. It is <strong>not recommended</strong> to statically ban any IP addresses unless you absolutely need to. Banning IPs often excludes the most vulnerable users who are forced to operate entirely behind Tor or other anonymity networks</small>
</div> </div>
<div *ngIf="currentSettings.remoteBanList" class="col-md-12"> <div *ngIf="remoteBanList" class="col-md-12">
<label for="general-ban-list-url" class="form-label">Ban list URL</label> <label for="general-ban-list-url" class="form-label">Ban list URL</label>
<div class="input-group mb-3"> <div class="input-group mb-3">
<input id="general-ban-list-url" type="text" class="form-control form-control-sm" placeholder="https://gui.xmr.pm/files/block.txt" aria-label="Ban list file url" aria-describedby="basic-addon3" [(ngModel)]="banListUrl" [ngModelOptions]="{standalone: true}"> <input id="general-ban-list-url" type="text" class="form-control form-control-sm" placeholder="https://gui.xmr.pm/files/block.txt" aria-label="Ban list file url" aria-describedby="basic-addon3" [(ngModel)]="banListUrl" [ngModelOptions]="{standalone: true}">

18
src/app/pages/settings/settings.component.ts
View file

@ -17,6 +17,7 @@ export class SettingsComponent {
public currentSettings: DaemonSettings; public currentSettings: DaemonSettings;
public banListUrl: string = ''; public banListUrl: string = '';
public remoteBanList: boolean = false;
public get validBanListUrl(): boolean { public get validBanListUrl(): boolean {
if (this.banListUrl == '') { if (this.banListUrl == '') {
@ -374,7 +375,7 @@ export class SettingsComponent {
public downloadingBanListFile: boolean = false; public downloadingBanListFile: boolean = false;
public async downloadBanListFile(): Promise<void> { public async downloadBanListFile(): Promise<void> {
if (!this.currentSettings.remoteBanList) { if (!this.remoteBanList) {
return; return;
} }
@ -382,14 +383,17 @@ export class SettingsComponent {
try { try {
const destination = await this.electronService.selectFolder(); const destination = await this.electronService.selectFolder();
const filePath = await this.electronService.downloadFile(this.banListUrl, destination);
if (!filePath.endsWith('.txt')) { if (destination != '') {
throw new Error("Downloaded file doesn't seem to be a valid ban list txt file"); const filePath = await this.electronService.downloadFile(this.banListUrl, destination);
if (!filePath.endsWith('.txt')) {
throw new Error("Downloaded file doesn't seem to be a valid ban list txt file");
}
this.currentSettings.banList = filePath;
this.remoteBanList = false;
} }
this.currentSettings.banList = filePath;
this.currentSettings.remoteBanList = false;
} }
catch (error: any) { catch (error: any) {
console.error(error); console.error(error);

1
src/common/DaemonSettings.ts
View file

@ -98,7 +98,6 @@ export class DaemonSettings {
public anonymousInbound: string = ''; public anonymousInbound: string = '';
public banList: string = ''; public banList: string = '';
public remoteBanList: boolean = false;
public hideMyPort: boolean = false; public hideMyPort: boolean = false;
public noSync: boolean = false; public noSync: boolean = false;