-
Notifications
You must be signed in to change notification settings - Fork 32
Ptero support #289
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.
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
Open
Zoriot
wants to merge
5
commits into
Osiris-Team:master
Choose a base branch
from
Zoriot:ptero-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Ptero support #289
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6b868fa
Disable Java + Self Updater on Ptero
Zoriot 592f746
Fix auto self updating for ptero
Zoriot b5e19ca
Add safe mode option for self-updater in Pterodactyl environment
Zoriot 783341f
Make it possible to force enable Java updater on Ptero servers.
Zoriot 9465599
Remove unnecessary comnment
Zoriot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
src/main/java/com/osiris/autoplug/client/utils/UtilsEnvironment.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright (c) 2026 Osiris-Team. | ||
| * All rights reserved. | ||
| * | ||
| * This software is copyrighted work, licensed under the terms | ||
| * of the MIT-License. Consult the "LICENSE" file for details. | ||
| */ | ||
|
|
||
| package com.osiris.autoplug.client.utils; | ||
|
|
||
| import java.util.Locale; | ||
| import java.util.Map; | ||
|
|
||
| public class UtilsEnvironment { | ||
| public boolean isPterodactylEnvironment() { | ||
| return isPterodactylEnvironment(System.getenv()); | ||
| } | ||
|
|
||
| public boolean isPterodactylEnvironment(Map<String, String> env) { | ||
| for (String key : env.keySet()) { | ||
| if (key == null) continue; | ||
| String upperKey = key.toUpperCase(Locale.ROOT); | ||
| if (upperKey.startsWith("PTERODACTYL_")) return true; | ||
| if (upperKey.startsWith("P_SERVER_")) return true; | ||
| } | ||
| return false; | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/test/java/com/osiris/autoplug/client/utils/UtilsEnvironmentTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright (c) 2026 Osiris-Team. | ||
| * All rights reserved. | ||
| * | ||
| * This software is copyrighted work, licensed under the terms | ||
| * of the MIT-License. Consult the "LICENSE" file for details. | ||
| */ | ||
|
|
||
| package com.osiris.autoplug.client.utils; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| class UtilsEnvironmentTest { | ||
| @Test | ||
| void detectsPterodactylEnvVars() { | ||
| UtilsEnvironment utilsEnvironment = new UtilsEnvironment(); | ||
|
|
||
| Map<String, String> env = new HashMap<>(); | ||
| env.put("P_SERVER_UUID", "abc"); | ||
| assertTrue(utilsEnvironment.isPterodactylEnvironment(env)); | ||
|
|
||
| env.clear(); | ||
| env.put("PTERODACTYL_SERVER_UUID", "abc"); | ||
| assertTrue(utilsEnvironment.isPterodactylEnvironment(env)); | ||
| } | ||
|
|
||
| @Test | ||
| void ignoresNonPterodactylEnvVars() { | ||
| UtilsEnvironment utilsEnvironment = new UtilsEnvironment(); | ||
|
|
||
| Map<String, String> env = new HashMap<>(); | ||
| env.put("SERVER_UUID", "abc"); | ||
| env.put("PANEL_NAME", "AutoPlug"); | ||
| assertFalse(utilsEnvironment.isPterodactylEnvironment(env)); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.