Revert "support blocking unhandled errors with --abort-on-uncaught-ex…

…ception" This reverts commit 5323576.
DataDog · Jun 25, 2024 · 52a7f2c · 52a7f2c
1 parent cb6fd05
commit 52a7f2c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 118 deletions.
diff --git a/integration-tests/appsec/index.spec.js b/integration-tests/appsec/index.spec.js
@@ -14,7 +14,7 @@ describe('RASP', () => {
   }
 
   const confs = [
-    { abortOnUncaughtException: true },
+    // { abortOnUncaughtException: true },
     { abortOnUncaughtException: false }]
   // execArgv  --abort-on-uncaught-exception
 
@@ -111,29 +111,6 @@ describe('RASP', () => {
           }
         })
 
-        it('should crash when promise rejection is not an AbortError', async () => {
-          let hasOutput = false
-          stdioHandler = () => {
-            hasOutput = true
-          }
-
-          try {
-            await axios.get('/crash-promise')
-
-            assert.fail('Request should have failed')
-          } catch (e) {
-            return new Promise((resolve, reject) => {
-              setTimeout(() => {
-                if (hasOutput) {
-                  resolve()
-                } else {
-                  reject(new Error('Output expected after crash'))
-                }
-              }, 50)
-            })
-          }
-        })
-
         it('should not crash when customer has his own setUncaughtExceptionCaptureCallback', async () => {
           let hasOutput = false
           stdioHandler = () => {
@@ -170,6 +147,7 @@ describe('RASP', () => {
 
               assert.fail('Request should have failed')
             } catch (e) {
+              // console.log(e)
               return new Promise((resolve, reject) => {
                 setTimeout(() => {
                   if (hasOutput) {

diff --git a/integration-tests/appsec/rasp/index.js b/integration-tests/appsec/rasp/index.js
@@ -50,12 +50,6 @@ app.get('/crash', () => {
   })
 })
 
-app.get('/crash-promise', () => {
-  process.nextTick(() => {
-    Promise.reject(new Error('Crash'))
-  })
-})
-
 app.get('/crash-and-recovery-A', (req, res) => {
   process.setUncaughtExceptionCaptureCallback(() => {
     res.writeHead(500)

diff --git a/packages/datadog-instrumentations/src/helpers/register.js b/packages/datadog-instrumentations/src/helpers/register.js
@@ -27,9 +27,6 @@ const loadChannel = channel('dd-trace:instrumentation:load')
 if (!disabledInstrumentations.has('fetch')) {
   require('../fetch')
 }
-if (!disabledInstrumentations.has('process')) {
-  require('../process')
-}
 
 const HOOK_SYMBOL = Symbol('hookExportsMap')
 

diff --git a/packages/datadog-instrumentations/src/process.js b/packages/datadog-instrumentations/src/process.js
diff --git a/packages/dd-trace/src/appsec/rasp.js b/packages/dd-trace/src/appsec/rasp.js
@@ -7,9 +7,6 @@ const { httpClientRequestStart } = require('./channels')
 const { reportStackTrace } = require('./stack_trace')
 const waf = require('./waf')
 const { getBlockingAction, block } = require('./blocking')
-const { channel } = require('dc-polyfill')
-
-const startSetUncaughtExceptionCaptureCallback = channel('datadog:process:setUncaughtExceptionCaptureCallback:start')
 
 class AbortError extends Error {
   constructor (req, res, blockingAction) {
@@ -21,12 +18,8 @@ class AbortError extends Error {
   }
 }
 
-function isAbortError (err) {
-  return err instanceof AbortError || err.cause instanceof AbortError
-}
-
 function handleUncaughtExceptionMonitor (err, origin) {
-  if (isAbortError(err)) {
+  if (err instanceof AbortError || err.cause instanceof AbortError) {
     const { req, res, blockingAction } = err
     block(req, res, web.root(req), null, blockingAction)
 
@@ -44,59 +37,12 @@ const RULE_TYPES = {
 
 let config, abortOnUncaughtException
 
-let previousCallback, userDefinedCallback
-
 function enable (_config) {
   config = _config
   httpClientRequestStart.subscribe(analyzeSsrf)
 
   process.on('uncaughtExceptionMonitor', handleUncaughtExceptionMonitor)
   abortOnUncaughtException = process.execArgv?.includes('--abort-on-uncaught-exception')
-
-  if (abortOnUncaughtException) {
-    process.on('unhandledRejection', function (err) {
-      if (isAbortError(err)) {
-        const { req, res, blockingAction } = err
-        block(req, res, web.root(req), null, blockingAction)
-      } else {
-        const listeners = process.listeners('unhandledRejection')
-        // do not force crash if there are more listeners
-        if (listeners.length === 1) {
-          // TODO check the --unhandled-rejections flag
-          throw err
-        }
-      }
-    })
-
-    let appsecCallbackSetted = false
-    startSetUncaughtExceptionCaptureCallback.subscribe(({ currentCallback, newCallback, abortController }) => {
-      previousCallback = currentCallback
-      if (appsecCallbackSetted) {
-        userDefinedCallback = newCallback
-        abortController.abort()
-      }
-    })
-
-    if (process.hasUncaughtExceptionCaptureCallback()) {
-      process.setUncaughtExceptionCaptureCallback(null)
-      userDefinedCallback = previousCallback
-    }
-
-    const exceptionCaptureCallback = function (err) {
-      if (!isAbortError(err)) {
-        if (userDefinedCallback) {
-          userDefinedCallback(err)
-        } else {
-          process.setUncaughtExceptionCaptureCallback(null)
-
-          throw err // app will crash by customer app reasons
-        }
-      }
-    }
-
-    process.setUncaughtExceptionCaptureCallback(exceptionCaptureCallback)
-    appsecCallbackSetted = true
-  }
 }
 
 function disable () {
@@ -142,7 +88,7 @@ function handleResult (actions, req, res, abortController) {
   if (blockingAction && abortController) {
     const rootSpan = web.root(req)
     // Should block only in express
-    if (rootSpan.context()._name === 'express.request') {
+    if (rootSpan.context()._name === 'express.request' && !abortOnUncaughtException) {
       const abortError = new AbortError(req, res, blockingAction)
       abortController.abort(abortError)