Standalone ASM configuration and span tags

docs/test.ts

@@ -134,6 +134,11 @@ tracer.init({
       redactionEnabled: true,
       redactionNamePattern: 'password',
       redactionValuePattern: 'bearer'
+    },
+    appsec: {
+      standalone: {
+        enabled: true
+      }
     }
   }
 })

index.d.ts

@@ -556,6 +556,19 @@ declare namespace tracer {
          */
         redactionValuePattern?: string
       }
+
+      appsec?: {
+        /**
+         * Configuration of Standalone ASM mode
+         */
+        standalone?: {
+          /**
+           * Whether to enable Standalone ASM.
+           * @default false
+           */
+          enabled?: boolean
+        }
+      }
     };
 
     /**

packages/dd-trace/src/appsec/iast/vulnerability-reporter.js

@@ -4,6 +4,7 @@ const { MANUAL_KEEP } = require('../../../../../ext/tags')
 const LRU = require('lru-cache')
 const vulnerabilitiesFormatter = require('./vulnerabilities-formatter')
 const { IAST_ENABLED_TAG_KEY, IAST_JSON_TAG_KEY } = require('./tags')
+const standalone = require('../standalone')
 
 const VULNERABILITIES_KEY = 'vulnerabilities'
 const VULNERABILITY_HASHES_MAX_SIZE = 1000
@@ -57,6 +58,9 @@ function sendVulnerabilities (vulnerabilities, rootSpan) {
         tags[IAST_JSON_TAG_KEY] = JSON.stringify(jsonToSend)
         tags[MANUAL_KEEP] = 'true'
         span.addTags(tags)
+
+        standalone.sample(span)
+
         if (!rootSpan) span.finish()
       }
     }

packages/dd-trace/src/appsec/reporter.js

@@ -13,6 +13,8 @@ const {
   getRequestMetrics
 } = require('./telemetry')
 const zlib = require('zlib')
+const { MANUAL_KEEP } = require('../../../../ext/tags')
+const standalone = require('./standalone')
 
 // default limiter, configurable with setRateLimit()
 let limiter = new Limiter(100)
@@ -88,7 +90,7 @@ function reportWafInit (wafVersion, rulesVersion, diagnosticsRules = {}) {
     metricsQueue.set('_dd.appsec.event_rules.errors', JSON.stringify(diagnosticsRules.errors))
   }
 
-  metricsQueue.set('manual.keep', 'true')
+  metricsQueue.set(MANUAL_KEEP, 'true')
 
   incrementWafInitMetric(wafVersion, rulesVersion)
 }
@@ -121,7 +123,9 @@ function reportAttack (attackData) {
   newTags['appsec.event'] = 'true'
 
   if (limiter.isAllowed()) {
-    newTags['manual.keep'] = 'true' // TODO: figure out how to keep appsec traces with sampling revamp
+    newTags[MANUAL_KEEP] = 'true'
+
+    standalone.sample(rootSpan)
   }
 
   // TODO: maybe add this to format.js later (to take decision as late as possible)
@@ -172,6 +176,8 @@ function finishRequest (req, res) {
   if (metricsQueue.size) {
     rootSpan.addTags(Object.fromEntries(metricsQueue))
 
+    standalone.sample(rootSpan)
+
     metricsQueue.clear()
   }
 

packages/dd-trace/src/appsec/sdk/track_event.js

@@ -4,6 +4,7 @@ const log = require('../../log')
 const { getRootSpan } = require('./utils')
 const { MANUAL_KEEP } = require('../../../../../ext/tags')
 const { setUserTags } = require('./set_user')
+const standalone = require('../standalone')
 
 function trackUserLoginSuccessEvent (tracer, user, metadata) {
   // TODO: better user check here and in _setUser() ?
@@ -73,6 +74,8 @@ function trackEvent (eventName, fields, sdkMethodName, rootSpan, mode) {
   }
 
   rootSpan.addTags(tags)
+
+  standalone.sample(rootSpan)
 }
 
 module.exports = {

packages/dd-trace/src/appsec/standalone.js

@@ -0,0 +1,43 @@
+'use strict'
+
+const { channel } = require('dc-polyfill')
+const { APM_TRACING_ENABLED_KEY, APPSEC_PROPAGATION_KEY } = require('../constants')
+
+const startCh = channel('dd-trace:span:start')
+
+let enabled
+
+function onSpanStart ({ span, fields }) {
+  const tags = span.context?.()?._tags
+  if (!tags) return
+
+  const { parent } = fields
+  if (!parent || parent._isRemote) {
+    tags[APM_TRACING_ENABLED_KEY] = 0
+  }
+}
+
+function configure (config) {
+  const configChanged = enabled !== config.appsec?.standalone?.enabled
+  if (!configChanged) return
+
+  enabled = config.appsec?.standalone?.enabled
+
+  if (enabled) {
+    startCh.subscribe(onSpanStart)
+  } else {
+    startCh.unsubscribe(onSpanStart)
+  }
+}
+
+function sample (span) {
+  const context = span.context?.()
+  if (enabled && context._trace?.tags) {
+    context._trace.tags[APPSEC_PROPAGATION_KEY] = '1'
+  }
+}
+
+module.exports = {
+  configure,
+  sample
+}

packages/dd-trace/src/config.js

@@ -440,6 +440,7 @@ class Config {
     this._setValue(defaults, 'appsec.rateLimit', 100)
     this._setValue(defaults, 'appsec.rules', undefined)
     this._setValue(defaults, 'appsec.sca.enabled', null)
+    this._setValue(defaults, 'appsec.standalone.enabled', undefined)
     this._setValue(defaults, 'appsec.wafTimeout', 5e3) // µs
     this._setValue(defaults, 'clientIpEnabled', false)
     this._setValue(defaults, 'clientIpHeader', null)
@@ -536,6 +537,7 @@ class Config {
       DD_DOGSTATSD_HOSTNAME,
       DD_DOGSTATSD_PORT,
       DD_ENV,
+      DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED,
       DD_EXPERIMENTAL_PROFILING_ENABLED,
       JEST_WORKER_ID,
       DD_IAST_DEDUPLICATION_ENABLED,
@@ -627,6 +629,7 @@ class Config {
     this._setString(env, 'appsec.rules', DD_APPSEC_RULES)
     // DD_APPSEC_SCA_ENABLED is never used locally, but only sent to the backend
     this._setBoolean(env, 'appsec.sca.enabled', DD_APPSEC_SCA_ENABLED)
+    this._setBoolean(env, 'appsec.standalone.enabled', DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED)
     this._setValue(env, 'appsec.wafTimeout', maybeInt(DD_APPSEC_WAF_TIMEOUT))
     this._envUnprocessed['appsec.wafTimeout'] = DD_APPSEC_WAF_TIMEOUT
     this._setBoolean(env, 'clientIpEnabled', DD_TRACE_CLIENT_IP_ENABLED)
@@ -767,6 +770,7 @@ class Config {
     this._setValue(opts, 'appsec.rateLimit', maybeInt(options.appsec.rateLimit))
     this._optsUnprocessed['appsec.rateLimit'] = options.appsec.rateLimit
     this._setString(opts, 'appsec.rules', options.appsec.rules)
+    this._setBoolean(opts, 'appsec.standalone.enabled', options.experimental?.appsec?.standalone?.enabled)
     this._setValue(opts, 'appsec.wafTimeout', maybeInt(options.appsec.wafTimeout))
     this._optsUnprocessed['appsec.wafTimeout'] = options.appsec.wafTimeout
     this._setBoolean(opts, 'clientIpEnabled', options.clientIpEnabled)

packages/dd-trace/src/constants.js

@@ -32,5 +32,7 @@ module.exports = {
   PEER_SERVICE_SOURCE_KEY: '_dd.peer.service.source',
   PEER_SERVICE_REMAP_KEY: '_dd.peer.service.remapped_from',
   SCI_REPOSITORY_URL: '_dd.git.repository_url',
-  SCI_COMMIT_SHA: '_dd.git.commit.sha'
+  SCI_COMMIT_SHA: '_dd.git.commit.sha',
+  APM_TRACING_ENABLED_KEY: '_dd.apm.enabled',
+  APPSEC_PROPAGATION_KEY: '_dd.p.appsec'
 }

packages/dd-trace/src/opentracing/span.js

@@ -99,7 +99,10 @@ class DatadogSpan {
       unfinishedRegistry.register(this, operationName, this)
     }
     spanleak.addSpan(this, operationName)
-    startCh.publish(this)
+
+    if (startCh.hasSubscribers) {
+      startCh.publish({ span: this, fields })
+    }
   }
 
   toString () {

packages/dd-trace/src/proxy.js

@@ -15,6 +15,7 @@ const NoopDogStatsDClient = require('./noop/dogstatsd')
 const spanleak = require('./spanleak')
 const { SSIHeuristics } = require('./profiling/ssi-heuristics')
 const telemetryLog = require('dc-polyfill').channel('datadog:telemetry:log')
+const appsecStandalone = require('./appsec/standalone')
 
 class LazyModule {
   constructor (provider) {
@@ -180,6 +181,7 @@ class Tracer extends NoopProxy {
       if (!this._tracingInitialized) {
         this._tracer = new DatadogTracer(config)
         this.appsec = new AppsecSdk(this._tracer, config)
+        appsecStandalone.configure(config)
         this._tracingInitialized = true
       }
       if (config.iast.enabled) {

packages/dd-trace/test/appsec/iast/vulnerability-reporter.spec.js

@@ -1,6 +1,9 @@
 const { addVulnerability, sendVulnerabilities, clearCache, start, stop } =
   require('../../../src/appsec/iast/vulnerability-reporter')
 const VulnerabilityAnalyzer = require('../../../../dd-trace/src/appsec/iast/analyzers/vulnerability-analyzer')
+const appsecStandalone = require('../../../src/appsec/standalone')
+const { APPSEC_PROPAGATION_KEY } = require('../../../src/constants')
+
 describe('vulnerability-reporter', () => {
   let vulnerabilityAnalyzer
 
@@ -9,6 +12,8 @@ describe('vulnerability-reporter', () => {
     vulnerabilityAnalyzer = new VulnerabilityAnalyzer('ANALYZER_TYPE')
   })
 
+  afterEach(sinon.restore)
+
   describe('addVulnerability', () => {
     it('should not break with invalid input', () => {
       addVulnerability()
@@ -130,10 +135,13 @@ describe('vulnerability-reporter', () => {
 
   describe('sendVulnerabilities', () => {
     let span
+    let context
 
     beforeEach(() => {
+      context = { _trace: { tags: {} } }
       span = {
-        addTags: sinon.stub()
+        addTags: sinon.stub(),
+        context: sinon.stub().returns(context)
       }
       start({
         iast: {
@@ -378,6 +386,40 @@ describe('vulnerability-reporter', () => {
           '{"spanId":888,"path":"filename.js","line":88}}]}'
       })
     })
+
+    it('should add _dd.p.appsec trace tag with standalone enabled', () => {
+      appsecStandalone.configure({ appsec: { standalone: { enabled: true } } })
+      const iastContext = { rootSpan: span }
+      addVulnerability(iastContext,
+        vulnerabilityAnalyzer._createVulnerability('INSECURE_HASHING', { value: 'sha1' }, 999))
+
+      sendVulnerabilities(iastContext.vulnerabilities, span)
+
+      expect(span.addTags).to.have.been.calledOnceWithExactly({
+        'manual.keep': 'true',
+        '_dd.iast.json': '{"sources":[],"vulnerabilities":[{"type":"INSECURE_HASHING","hash":3254801297,' +
+          '"evidence":{"value":"sha1"},"location":{"spanId":999}}]}'
+      })
+
+      expect(span.context()._trace.tags).to.have.property(APPSEC_PROPAGATION_KEY)
+    })
+
+    it('should not add _dd.p.appsec trace tag with standalone disabled', () => {
+      appsecStandalone.configure({ appsec: {} })
+      const iastContext = { rootSpan: span }
+      addVulnerability(iastContext,
+        vulnerabilityAnalyzer._createVulnerability('INSECURE_HASHING', { value: 'sha1' }, 999))
+
+      sendVulnerabilities(iastContext.vulnerabilities, span)
+
+      expect(span.addTags).to.have.been.calledOnceWithExactly({
+        'manual.keep': 'true',
+        '_dd.iast.json': '{"sources":[],"vulnerabilities":[{"type":"INSECURE_HASHING","hash":3254801297,' +
+          '"evidence":{"value":"sha1"},"location":{"spanId":999}}]}'
+      })
+
+      expect(span.context()._trace.tags).to.not.have.property(APPSEC_PROPAGATION_KEY)
+    })
   })
 
   describe('clearCache', () => {

packages/dd-trace/test/appsec/reporter.spec.js

@@ -9,6 +9,7 @@ describe('reporter', () => {
   let span
   let web
   let telemetry
+  let sample
 
   beforeEach(() => {
     span = {
@@ -32,9 +33,14 @@ describe('reporter', () => {
       getRequestMetrics: sinon.stub()
     }
 
+    sample = sinon.stub()
+
     Reporter = proxyquire('../../src/appsec/reporter', {
       '../plugins/util/web': web,
-      './telemetry': telemetry
+      './telemetry': telemetry,
+      './standalone': {
+        sample
+      }
     })
   })
 
@@ -289,6 +295,27 @@ describe('reporter', () => {
         'network.client.ip': '8.8.8.8'
       })
     })
+
+    it('should call standalone sample', () => {
+      span.context()._tags = { '_dd.appsec.json': '{"triggers":[{"rule":{},"rule_matches":[{}]}]}' }
+
+      const result = Reporter.reportAttack('[{"rule":{}},{"rule":{},"rule_matches":[{}]}]')
+      expect(result).to.not.be.false
+      expect(web.root).to.have.been.calledOnceWith(req)
+
+      expect(span.addTags).to.have.been.calledOnceWithExactly({
+        'http.request.headers.host': 'localhost',
+        'http.request.headers.user-agent': 'arachni',
+        'appsec.event': 'true',
+        'manual.keep': 'true',
+        '_dd.origin': 'appsec',
+        '_dd.appsec.json': '{"triggers":[{"rule":{},"rule_matches":[{}]},{"rule":{}},{"rule":{},"rule_matches":[{}]}]}',
+        'http.useragent': 'arachni',
+        'network.client.ip': '8.8.8.8'
+      })
+
+      expect(sample).to.have.been.calledOnceWithExactly(span)
+    })
   })
 
   describe('reportWafUpdate', () => {

packages/dd-trace/test/appsec/sdk/track_event.spec.js

@@ -14,6 +14,7 @@ describe('track_event', () => {
     let getRootSpan
     let setUserTags
     let trackUserLoginSuccessEvent, trackUserLoginFailureEvent, trackCustomEvent, trackEvent
+    let sample
 
     beforeEach(() => {
       log = {
@@ -28,13 +29,18 @@ describe('track_event', () => {
 
       setUserTags = sinon.stub()
 
+      sample = sinon.stub()
+
       const trackEvents = proxyquire('../../../src/appsec/sdk/track_event', {
         '../../log': log,
         './utils': {
           getRootSpan
         },
         './set_user': {
           setUserTags
+        },
+        '../standalone': {
+          sample
         }
       })
 
@@ -249,6 +255,16 @@ describe('track_event', () => {
           'appsec.events.event.metakey2': 'metaValue2'
         })
       })
+
+      it('should call standalone sample', () => {
+        trackEvent('event', undefined, 'trackEvent', rootSpan, undefined)
+
+        expect(rootSpan.addTags).to.have.been.calledOnceWithExactly({
+          'appsec.events.event.track': 'true',
+          'manual.keep': 'true'
+        })
+        expect(sample).to.have.been.calledOnceWithExactly(rootSpan)
+      })
     })
   })