manager: smoother server pin changing (fixes #9217) (#9236)

Co-authored-by: mutugiii <[email protected]>
Co-authored-by: dogi <[email protected]>

Author: 3 people

package.json

@@ -1,10 +1,10 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.20.64",
+  "version": "0.20.65",
   "myplanet": {
-    "latest": "v0.36.37",
-    "min": "v0.35.37"
+    "latest": "v0.36.44",
+    "min": "v0.35.44"
   },
   "scripts": {
     "ng": "ng",

src/app/manager-dashboard/manager-dashboard.component.html

@@ -77,7 +77,7 @@ <h3 i18n *ngIf="showParentList">{{ planetType === 'community' ? 'Nation' : 'Cent
       </ng-container>
     </div>
     <div *ngIf="pin"><span i18n>myPlanet Server pin:</span> <b class="pinClass">{{ ' ' + pin + ' ' }}</b>
-      <button mat-raised-button i18n (click)="resetPin()">Reset Pin</button>
+      <button mat-raised-button i18n (click)="confirmResetPin()">Reset Pin</button>
     </div>
   </ng-container>
   <div>

src/app/manager-dashboard/manager-dashboard.component.ts

@@ -36,6 +36,7 @@ export class ManagerDashboardComponent implements OnInit, OnDestroy {
   versionLatestApk = '';
   versionLocalApk = '';
   dialogRef: MatDialogRef<DialogsListComponent>;
+  resetPinDialog: MatDialogRef<DialogsPromptComponent>;
   pin: string;
   activityLogs: any = {};
   private onDestroy$ = new Subject<void>();
@@ -248,22 +249,39 @@ export class ManagerDashboardComponent implements OnInit, OnDestroy {
     }
   }
 
-  resetPin() {
-    const userName = 'org.couchdb.user:satellite';
-    this.couchService.get('_users/' + userName)
-    .pipe(switchMap((data) => {
-      const { derived_key, iterations, password_scheme, salt, ...satelliteProfile } = data;
-      satelliteProfile.password = this.managerService.createPin();
-      return forkJoin([
-        this.couchService.put('_users/' + userName, satelliteProfile),
-        this.couchService.put('_node/nonode@nohost/_config/satellite/pin', satelliteProfile.password)
-      ]);
-    })).subscribe((res) => {
-      this.getSatellitePin();
-      this.planetMessageService.showMessage($localize`Pin reset successfully`);
-    }, (error) => this.planetMessageService.showAlert($localize`Error to reset pin`));
+  confirmResetPin() {
+    this.resetPinDialog = this.dialog.open(DialogsPromptComponent, {
+      data: {
+        type: 'pin',
+        changeType: 'reset',
+        okClick: {
+          request: this.resetPin(),
+          onNext: () => {
+            this.resetPinDialog.close();
+            this.getSatellitePin();
+            this.planetMessageService.showMessage($localize`PIN reset successfully`);
+          },
+          onError: () => this.planetMessageService.showAlert($localize`There was an error resetting the PIN`)
+        }
+      }
+    });
   }
 
+  resetPin() {
+  const userName = 'org.couchdb.user:satellite';
+  return this.couchService.get('_users/' + userName)
+    .pipe(
+      switchMap((data) => {
+        const { derived_key, iterations, password_scheme, salt, ...satelliteProfile } = data;
+        satelliteProfile.password = this.managerService.createPin();
+        return forkJoin([
+          this.couchService.put('_users/' + userName, satelliteProfile),
+          this.couchService.put('_node/nonode@nohost/_config/satellite/pin', satelliteProfile.password)
+        ]);
+      })
+    );
+}
+
   setVersions() {
     const opts = { responseType: 'text', withCredentials: false, headers: { 'Content-Type': 'text/plain' } };
     this.managerService.getVersion('planet', opts).subscribe((version: string) => this.versionLocal = version);

src/app/manager-dashboard/manager.service.ts

@@ -58,7 +58,18 @@ export class ManagerService {
   }
 
   createPin() {
-    return Array(4).fill(0).map(() => Math.floor(Math.random() * 10)).join('');
+    // Use window.crypto.getRandomValues for cryptographically secure random digits
+    const pinArray = new Uint8Array(4);
+    window.crypto.getRandomValues(pinArray);
+    // Map random bytes to digits 0-9 without modulo bias
+    return Array.from(pinArray, byte => {
+      // Discard and retry if value is > 249 to prevent modulo bias
+      let digit = byte;
+      while (digit > 249) {
+        digit = window.crypto.getRandomValues(new Uint8Array(1))[0];
+      }
+      return (digit % 10).toString();
+    }).join('');
   }
 
   getChildPlanets(onlyAccepted = false, parentCode = this.stateService.configuration.code, domain?) {

src/app/shared/dialogs/dialogs-prompt.component.html

@@ -1,7 +1,7 @@
 <mat-dialog-content>
   <b *ngIf="data.type === 'changes'" i18n>You have unsaved changes.</b>
   <p *ngIf="showMainParagraph" i18n>
-    Are you sure you want to {data.changeType, select, accept {accept} archive {archive} reject {reject} delete {delete} leave {leave} remove {remove} leader {give leadership to} exit {leave}}
+    Are you sure you want to {data.changeType, select, accept {accept} archive {archive} reject {reject} delete {delete} leave {leave} remove {remove} leader {give leadership to} exit {leave} reset {reset}}
       the {data.amount, select, single
       {following {data.type, select,
         community {community}
@@ -22,6 +22,7 @@
         news {message}
         report {report}
         changes {form}
+        pin {pin}
         survey {survey}}?
       }
       many