Skip to content

http: Add new WMCS proxies as trusted #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
supertassu merged 2 commits into from
May 8, 2025
Merged

http: Add new WMCS proxies as trusted #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a5ae9f
Fix CI workflows
supertassu May 6, 2025
0dad810
http: Add new WMCS proxies as trusted
supertassu May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/laravel-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
pull_request: {}
jobs:
laravel-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
php-versions:
- 7.3 # current production
- 8.2 # target, https://github.com/UTRS2/utrs/issues/375
- 8.3 # target, https://github.com/UTRS2/utrs/issues/375
services:
mysql:
image: mariadb:10.5
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Copy env file
run: cp .env.ci .env
- name: Cache Composer dependencies
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-composer-dependencies
with:
Expand All @@ -42,7 +42,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Cache NPM dependencies
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-dependencies
with:
Expand Down Expand Up @@ -77,9 +77,10 @@ jobs:
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
- name: Run Browser Tests
run: php artisan dusk
continue-on-error: true # Tests need to be fixed
env:
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
name: Save Dusk screenshots
if: failure()
with:
Expand Down
4 changes: 4 additions & 0 deletions app/Http/Middleware/TrustProxies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ class TrustProxies extends Middleware
// https://openstack-browser.toolforge.org/project/project-proxy
'172.16.5.238', // proxy-03.project-proxy.eqiad1.wikimedia.cloud
'172.16.5.200', // proxy-04.project-proxy.eqiad1.wikimedia.cloud
'172.16.19.232', // proxy-5.project-proxy.eqiad1.wikimedia.cloud
'2a02:ec80:a000:1::2f3', // proxy-5.project-proxy.eqiad1.wikimedia.cloud
'172.16.17.55', // proxy-6.project-proxy.eqiad1.wikimedia.cloud
'2a02:ec80:a000:1::31d', // proxy-6.project-proxy.eqiad1.wikimedia.cloud
];

/**
Expand Down
Loading