Merge pull request #15781 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/triage-unallowed-contributions.yml

@@ -7,6 +7,7 @@ name: Check unallowed file changes
 on:
   pull_request_target:
     paths:
+      - '.devcontainer/**'
       - '.github/actions-scripts/**'
       - '.github/workflows/**'
       - '.github/CODEOWNERS'
@@ -54,6 +55,7 @@ jobs:
             openapi:
               - 'lib/rest/static/**'
             notAllowed:
+              - '.devcontainer/**'
               - '.github/actions-scripts/**'
               - '.github/workflows/**'
               - '.github/CODEOWNERS'
@@ -78,6 +80,7 @@ jobs:
         with:
           script: |
             const badFilesArr = [
+              '.devcontainer/**',
               '.github/actions-scripts/**',
               '.github/workflows/**',
               '.github/CODEOWNERS',

middleware/rate-limit.js

@@ -16,7 +16,8 @@ export default rateLimit({
   max: 100,
 
   handler: (request, response, next, options) => {
-    const tags = [`url:${request.url}`, `ip:${request.ip}`]
+    const ip = request.headers['x-forwarded-for'] || request.ip
+    const tags = [`url:${request.url}`, `ip:${ip}`]
     statsd.increment('rate_limit', 1, tags)
     // NOTE! At the time of writing, the actual rate limiting is disabled!
     // At least we can start recording how often this happens in Datadog.