fix: No longer double reporting MFA server errors and gracefully hand…

…ling address in use errors
steilerDev · Jul 6, 2023 · c916e17 · c916e17
1 parent 5587f94
commit c916e17
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/app/src/app/error/codes/mfa.ts b/app/src/app/error/codes/mfa.ts
@@ -11,6 +11,14 @@ export const STARTUP_FAILED: ErrorStruct = buildErrorStruct(
     name, prefix, `STARTUP_FAILED`, `Unable to start MFA server`,
 );
 
+export const SERVER_ERR: ErrorStruct = buildErrorStruct(
+    name, prefix, `SERVER_ERR`, `HTTP Server Error`,
+);
+
+export const ADDR_IN_USE_ERR: ErrorStruct = buildErrorStruct(
+    name, prefix, `ADDR_IN_USE`, `HTTP Server could not start, because address/port is in use`,
+);
+
 export const RESEND_REQUEST_FAILED: ErrorStruct = buildErrorStruct(
     name, prefix, `RESEND_REQUEST_FAILED`, `Resending request failed`,
 );

diff --git a/app/src/app/event/error-handler.ts b/app/src/app/event/error-handler.ts
@@ -5,7 +5,7 @@ import {getLogger, logFilePath} from "../../lib/logger.js";
 import {iCPSError} from "../error/error.js";
 import {randomUUID} from "crypto";
 import {EventHandler} from './event-handler.js';
-import {AUTH_ERR, ERR_SIGINT, ERR_SIGTERM, LIBRARY_ERR} from '../error/error-codes.js';
+import {AUTH_ERR, ERR_SIGINT, ERR_SIGTERM, LIBRARY_ERR, MFA_ERR} from '../error/error-codes.js';
 import {iCPSAppOptions} from '../factory.js';
 import * as SYNC_ENGINE from '../../lib/sync-engine/constants.js';
 import {SyncEngine} from '../../lib/sync-engine/sync-engine.js';
@@ -28,8 +28,9 @@ export const WARN_EVENT = `warn`;
 const reportDenyList = [
     ERR_SIGINT.code,
     ERR_SIGTERM.code,
+    MFA_ERR.ADDR_IN_USE_ERR.code, // Only happens if port/address is in use
     // LIBRARY_ERR.LOCKED.code,
-    AUTH_ERR.UNAUTHORIZED.code,
+    AUTH_ERR.UNAUTHORIZED.code, // Only happens if username/password don't match
 ];
 
 const BACKTRACE_SUBMISSION = {

diff --git a/app/src/lib/icloud/icloud.ts b/app/src/lib/icloud/icloud.ts
@@ -62,7 +62,6 @@ export class iCloud extends EventEmitter {
         this.mfaServer = new MFAServer(app.options.port);
         this.mfaServer.on(MFA_SERVER.EVENTS.MFA_RECEIVED, this.submitMFA.bind(this));
         this.mfaServer.on(MFA_SERVER.EVENTS.MFA_RESEND, this.resendMFA.bind(this));
-        this.mfaServer.on(HANDLER_EVENT, this.emit.bind(this, HANDLER_EVENT));
 
         // ICloud Auth object
         this.auth = new iCloudAuth(app.options.username, app.options.password, app.options.trustToken, app.options.dataDir);

diff --git a/app/src/lib/icloud/mfa/mfa-server.ts b/app/src/lib/icloud/mfa/mfa-server.ts
@@ -43,6 +43,15 @@ export class MFAServer extends EventEmitter {
 
         this.logger.debug(`Preparing MFA server on port ${this.port}`);
         this.server = http.createServer(this.handleRequest.bind(this));
+        this.server.on(`error`, err => {
+            const icpsErr = Object.hasOwn(err, `code`) && (err as any).code === `EADDRINUSE`
+                ? new iCPSError(MFA_ERR.ADDR_IN_USE_ERR).addContext(`port`, this.port)
+                : new iCPSError(MFA_ERR.SERVER_ERR);
+
+            icpsErr.addCause(err);
+
+            this.emit(HANDLER_EVENT, icpsErr);
+        });
 
         // Default MFA request always goes to device
         this.mfaMethod = new MFAMethod();