Skip to content
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

[pull] master from runelite:master #81

Merged
merged 2 commits into from
Mar 13, 2024
Merged

[pull] master from runelite:master #81

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
6edc722
fix certificate adjacency list logging with java.net.http client
Adam- Mar 12, 2024
cb617c1
ci: update actions
Adam- Mar 12, 2024
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
30 changes: 15 additions & 15 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ jobs:
windows:
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.m2/repository
Expand All @@ -19,7 +19,7 @@ jobs:
${{ runner.os }}-cache-
- run: choco install innosetup --version 6.2.2
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- name: AArch64 installer
shell: bash
run: ./build-win-aarch64.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: windows
path: |
Expand All @@ -71,19 +71,19 @@ jobs:
steps:
- run: sudo apt update
- run: sudo apt install -y gcc-9-aarch64-linux-gnu g++-9-aarch64-linux-gnu
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.m2/repository
key: ${{ runner.os }}-cache-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-cache-
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand All @@ -93,12 +93,12 @@ jobs:
run: ./build-linux-x86_64.sh
- name: linux-aarch64
run: ./build-linux-aarch64.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: jar
path: target/RuneLite.jar
if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: linux
path: |
Expand All @@ -108,22 +108,22 @@ jobs:
macos:
runs-on: macos-11
steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.m2/repository
key: ${{ runner.os }}-cache-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-cache-
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand All @@ -146,14 +146,14 @@ jobs:
# tar app to keep permissions correct
- name: tar app
run: tar -cf app.tar build/macos-x64/RuneLite.app build/macos-aarch64/RuneLite.app build-osx-x64.sh build-osx-aarch64.sh osx/signing.entitlements
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: macos-dmg
path: |
RuneLite-x64.dmg
RuneLite-aarch64.dmg
if-no-files-found: error
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: macos-app
path: |
Expand Down
19 changes: 4 additions & 15 deletions src/main/java8/net/runelite/launcher/CertPathExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
*/
package net.runelite.launcher;

import javax.net.ssl.SSLHandshakeException;
import sun.security.provider.certpath.AdjacencyList;
import sun.security.provider.certpath.SunCertPathBuilderException;
import sun.security.validator.ValidatorException;
Expand All @@ -33,22 +32,12 @@ class CertPathExtractor
{
static String extract(Throwable ex)
{
// IOException -> SSLHandshakeException -> ValidatorException -> SunCertPathBuilderException
try
{
if (ex instanceof SSLHandshakeException)
{
ex = ex.getCause();
if (ex instanceof ValidatorException)
{
ex = ex.getCause();
if (ex instanceof SunCertPathBuilderException)
{
SunCertPathBuilderException pathBuilderEx = (SunCertPathBuilderException) ex;
AdjacencyList adjList = pathBuilderEx.getAdjacencyList();
return adjList.toString();
}
}
}
SunCertPathBuilderException pathBuilderEx = (SunCertPathBuilderException) ex.getCause().getCause().getCause();
AdjacencyList adjList = pathBuilderEx.getAdjacencyList();
return adjList.toString();
}
catch (Throwable ex_)
{
Expand Down