Skip to content

[pull] master from YOURLS:master - #36

Open
pull[bot] wants to merge 374 commits into
caesar-team:masterfrom
YOURLS:master
Open

[pull] master from YOURLS:master#36
pull[bot] wants to merge 374 commits into
caesar-team:masterfrom
YOURLS:master

Conversation

@pull

@pull pull Bot commented Feb 9, 2022 •
edited
Loading

Copy link
Copy Markdown

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added the ⤵️ pull label Feb 9, 2022
@pull pull Bot added the merge-conflict Resolve conflicts manually label Feb 16, 2022
dependabot Bot and others added 28 commits July 17, 2023 21:19
@dependabot @github-actions
Bump shivammathur/setup-php from 2.25.2 to 2.25.4
e467ed0 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.25.2 to 2.25.4.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.25.2...2.25.4)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@ozh @LeoColomb
Update GeoIP DB
0ad8553
@dependabot @github-actions
Bump shivammathur/setup-php from 2.25.4 to 2.25.5
37ca19f 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.25.4 to 2.25.5.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.25.4...2.25.5)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yourls-bot @ozh
Update GeoIP DB (#3593)
b044424 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@yourls-bot @ozh
Update GeoIP DB (#3602)
50eca4b 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@dependabot @github-actions
Bump actions/checkout from 3 to 4
fe73bb7 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump tibdex/github-app-token from 1 to 2
b21dcb5 
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1 to 2.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](tibdex/github-app-token@v1...v2)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.25.5 to 2.26.0
0e490df 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.25.5 to 2.26.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.25.5...2.26.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@ozh @LeoColomb
Update GeoIP DB
859289c
@dependabot @github-actions
Bump shivammathur/setup-php from 2.26.0 to 2.27.0
6f371af 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.26.0 to 2.27.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.26.0...2.27.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.27.0 to 2.27.1
8158410 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.27.0 to 2.27.1.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.27.0...2.27.1)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@mohammadshg84
Update readme.html (#3669)
af4ec44 
Considering the change of the address of the blog page, why not update the link? And also the new link have SSL.
@yourls-bot @ozh
Update GeoIP DB (#3656)
ba3fce2 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@github-actions @ozh
Update certificates (#3612)
e9158d0 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.27.1 to 2.28.0
f7fbeac 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.27.1...2.28.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yourls-bot @ozh
Update GeoIP DB (#3672)
b493c47 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.28.0 to 2.29.0
be573de 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.28.0...2.29.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yourls-bot @ozh
Update GeoIP DB (#3689)
8bfa95b 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@github-actions @ozh
Update certificates (#3690)
e0c7fc9 
Co-authored-by: ozh <ozh@users.noreply.github.com>
@dependabot @github-actions
Bump peter-evans/create-pull-request from 5 to 6
02278cd 
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@v5...v6)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.29.0 to 2.30.0
435b080 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.29.0 to 2.30.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.29.0...2.30.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yourls-bot @ozh
Update GeoIP DB (#3713)
2c6a6b1 
Co-authored-by: ozh <223647+ozh@users.noreply.github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.30.0 to 2.30.1
43c5855 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.30.0 to 2.30.1.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.30.0...2.30.1)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.30.1 to 2.30.2
268aa5e 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.30.1 to 2.30.2.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.30.1...2.30.2)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.30.2 to 2.30.3
8814f5e 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.30.2 to 2.30.3.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.30.2...2.30.3)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @github-actions
Bump shivammathur/setup-php from 2.30.3 to 2.30.4
aed6bb9 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.30.3 to 2.30.4.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.30.3...2.30.4)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dgw
Ensure all statusCode/errorCode API values are strings (#3756)
469763c 
PHPDoc comments about the API response format say that both `statusCode`
and `errorCode` are expected to be strings, but a lot of cases were
returning ints instead. This could cause problems for JSON clients.
@dependabot @github-actions
Bump shivammathur/setup-php from 2.30.4 to 2.30.5
395dabe 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.30.4 to 2.30.5.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.30.4...2.30.5)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot Bot and others added 30 commits June 9, 2026 04:43
@dependabot @github-actions
Bump shivammathur/setup-php from 2.37.1 to 2.37.2
d0ad0b7 
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.37.1 to 2.37.2.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.37.1...2.37.2)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-version: 2.37.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yourls-bot @github-actions
Update GeoIP DB
77cb9e3
@ozh @dgw
Fix early yourls_esc_html() (#4122)
90eb03a 
* Fix early yourls_esc_html()

* Update includes/functions-html.php

---------

Co-authored-by: dgw <dgw@technobabbl.es>
@dependabot @github-actions
Bump actions/checkout from 6 to 7
420e866 
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@yourls-bot @github-actions
Update GeoIP DB
56c85b7
@yourls-bot @github-actions
Update GeoIP DB
636da45
@ozh @dgw
Restore limited HTML in plugin list (#4128)
88d5151 
* Restore limited HTML in plugin list
* Add unit tests for this

Co-authored-by: dgw <dgw@technobabbl.es>
@ozh
Update dependencies (#4112)
a0dadcf 
* Update dependencies
  - Upgrading composer/ca-bundle (1.5.5 => 1.5.12)
  - Upgrading maxmind-db/reader (v1.12.0 => v1.13.1)
  - Upgrading maxmind/web-service-common (v0.10.0 => v0.11.1)
  - Upgrading ozh/bookmarkletgen (1.2.2 => 1.3)
  - Upgrading rmccue/requests (v2.0.15 => v2.0.18)
  - Upgrading symfony/polyfill-intl-idn (v1.31.0 => v1.38.1)
  - Upgrading symfony/polyfill-intl-normalizer (v1.31.0 => v1.38.0)
  - Upgrading symfony/polyfill-mbstring (v1.31.0 => v1.38.1)
* composer config platform-check false
@ozh
Make tests independent of constants ; remove some const and define ge…
b8c7882 
…tters (#4124)

* Make tests independent of YOURLS_UNIQUE_URLS
* Tests are independent of YOURLS_PRIVATE
* Make tests independent of YOURLS_URL_CONVERT
* Make tests independent of YOURLS_FLOOD_*
* Introduce filtered getters for YOURLS_FLOOD_DELAY_SECONDS and YOURLS_FLOOD_IP_WHITELIST.
* Tests are independent of YOURLS_HOURS_OFFSET
* Tests are independent of YOURLS_COOKIEKEY
* Speed up a bit the hash tests
* More tests with a few easy functions
* Trickier tests: yourls_page() and yourls_die()
* Remove constants from Config.php and from test config sample.

Closes #4068
@yourls-bot @github-actions
Update GeoIP DB
56e46e4
@yourls-bot @github-actions
Update certificates
c0f5cb9
@TowyTowy
Return HTTP 409 Conflict (not 400) when a duplicate long URL is rejec…
3c69b67 
…ted (#4133)
@yourls-bot @github-actions
Update GeoIP DB
f2a1d0b
@yourls-bot @github-actions
Update GeoIP DB
6469f55
@yourls-bot @github-actions
Update certificates
35aa738
@yourls-bot @github-actions
Update GeoIP DB
3f3d0d5
@ozh
Make YOURLS_COOKIEKEY unpredictable (#4139)
cd307e9 
New logic : if YOURLS_COOKIEKEY isn't defined, or is a publicly known value, die.
@yourls-bot @github-actions
Update GeoIP DB
2c0bd54
@ozh
Restrict remote title fetch to public hosts for anonymous users (#4141)
410274c 
* Introduce test scenarios for consts
* Restrict remote title fetch to public hosts for anonymous users
* Add tests

Hat tip: @5ud0er for reporting the issue in the first place
@ozh @dgw
Fix for path traversal in pages (#4142)
4e85972 
* Add expected-to-fail tests for path-traversal attacks into pages
* Forbid '..' in pages
* Harden yourls_get_request()

Co-authored-by: dgw <dgw@technobabbl.es>
Hat tip @web-hacker-team
@yourls-bot @github-actions
Update GeoIP DB
54eda57
@ozh
Fix content-type edge cases when fetching titles (#4147)
f076ab2 
* Fix content-type edge cases when fetching titles
* Remove the @ operators

Fixes #4143
@yourls-bot @github-actions
Update GeoIP DB
af85478
@yourls-bot @github-actions
Update certificates
33de884
@ozh
SSRF & local IP followup (#4145)
2f6c066 
* SSRF & local IP followup

Damn I learned a whole lot about IP adresses and how IPv6 tries _way too hard_ to make friends with IPv4 :)

* Add note about DNS rebinding

So that future security experts using Claude will not submit advisories or PR about this.

* More PHP 8.1 8.2 vs 8.3 discrepancies

`2001:db8::1` is rejected on 8.1 & 8.2, not after. Dropping the entry rather than checking PHP ver.
@ozh @LeoColomb
Update CHANGELOG for version 1.10.5 (#4152)
f235ee3 
* Update CHANGELOG for version 1.10.5

Co-authored-by: Léo Colombaro <LeoColomb@users.noreply.github.com>
@yourls-bot @github-actions
Update GeoIP DB
f0b8a61
@ozh
1.10.6 (#4156)
8220c8d 
* Update CHANGELOG
* Update YOURLS version to 1.10.6

Fixes #4155
@ozh
1.10.7-dev (#4158)
e44db29 
Bump YOURLS version to 1.10.7-dev
@yourls-bot @github-actions
Update GeoIP DB
b0d03a0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.