Skip to content

feat: add proxy configuration support with encryption and update test… #150

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
CodeDead merged 3 commits into from
Oct 30, 2026
+1,148 −235
Merged

feat: add proxy configuration support with encryption and update test… #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dee534
feat: add proxy configuration support with encryption and update test…
CodeDead Oct 30, 2026
edf5b94
feat: improve localization with language updates and fix Japanese tag…
CodeDead Oct 30, 2026
cdb7780
refactor: extract URL command builder and simplify sound pane filteri…
CodeDead Oct 30, 2026
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
8 changes: 7 additions & 1 deletion src/main/java/com/codedead/opal/OpalApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.codedead.opal;

import com.codedead.opal.controller.LanguageController;
import com.codedead.opal.controller.ThemeController;
import com.codedead.opal.controller.UpdateController;
import com.codedead.opal.utils.FxUtils;
Expand Down Expand Up @@ -35,6 +36,11 @@ public class OpalApplication extends Application {
* @param args The application arguments
*/
public static void main(final String[] args) {
// The JDK disables Basic authentication for HTTPS proxy tunneling by default
if (System.getProperty("jdk.http.auth.tunneling.disabledSchemes") == null) {
System.setProperty("jdk.http.auth.tunneling.disabledSchemes", "");
}

System.setProperty("logBasePath", SharedVariables.PROPERTIES_BASE_PATH);
logger = LogManager.getLogger(OpalApplication.class);

Expand Down Expand Up @@ -85,7 +91,7 @@ public void start(final Stage primaryStage) {

ThemeController.setTheme(properties.getProperty("theme", "light"));

final Locale locale = Locale.forLanguageTag(languageTag);
final Locale locale = LanguageController.getLocaleFromLanguageTag(languageTag);
final ResourceBundle translationBundle = ResourceBundle.getBundle("translations.OpalApplication", locale);

final FXMLLoader loader = new FXMLLoader(getClass().getResource("/windows/MainWindow.fxml"), translationBundle);
Expand Down
17 changes: 15 additions & 2 deletions src/main/java/com/codedead/opal/controller/LanguageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.codedead.opal.controller;

import java.util.Locale;

import static com.codedead.opal.utils.SharedVariables.DEFAULT_LOCALE;

public final class LanguageController {
Expand All @@ -23,7 +25,7 @@ public static int getLanguageIndexFromLocale(final String locale) {
case "es-es" -> 2;
case "fr-fr" -> 3;
case "hi-in" -> 4;
case "jp-jp" -> 5;
case "ja-jp", "jp-jp" -> 5;
case "nl-nl" -> 6;
case "ru-ru" -> 7;
case "tr-tr" -> 8;
Expand All @@ -33,6 +35,17 @@ public static int getLanguageIndexFromLocale(final String locale) {
};
}

/**
* Get the locale from the language tag, migrating the legacy Japanese tag
*
* @param languageTag The language tag
* @return The locale
*/
public static Locale getLocaleFromLanguageTag(final String languageTag) {
final String normalizedLanguageTag = "jp-JP".equalsIgnoreCase(languageTag) ? "ja-JP" : languageTag;
return Locale.forLanguageTag(normalizedLanguageTag);
}

/**
* Get the locale from the language index
*
Expand All @@ -45,7 +58,7 @@ public static String getLocaleFromLanguageIndex(final int index) {
case 2 -> "es-ES";
case 3 -> "fr-FR";
case 4 -> "hi-in";
case 5 -> "jp-JP";
case 5 -> "ja-JP";
case 6 -> "nl-NL";
case 7 -> "ru-RU";
case 8 -> "tr-TR";
Expand Down
175 changes: 89 additions & 86 deletions src/main/java/com/codedead/opal/controller/MainWindowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.codedead.opal.interfaces.TrayIconListener;
import com.codedead.opal.utils.FxUtils;
import com.codedead.opal.utils.HelpUtils;
import com.codedead.opal.utils.PasswordCipher;
import com.codedead.opal.utils.RunnableFileOpener;
import com.codedead.opal.utils.SharedVariables;
import javafx.application.Platform;
Expand Down Expand Up @@ -34,9 +35,9 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.GeneralSecurityException;
import java.util.*;

import static com.codedead.opal.utils.SharedVariables.DEFAULT_LOCALE;
Expand Down Expand Up @@ -197,6 +198,7 @@ public final class MainWindowController implements IAudioTimer, TrayIconListener
private TimerTask countDownTask;
private final String platformName;
private final HelpUtils helpUtils;
private final PasswordCipher passwordCipher;
private final JsonMapper jsonMapper;
private final Timer timer;
private final Timer countDownTimer;
Expand All @@ -215,6 +217,7 @@ public MainWindowController() {

platformName = OsCheck.getOperatingSystemType().name();
helpUtils = new HelpUtils();
passwordCipher = new PasswordCipher();

this.timer = new Timer();
this.countDownTimer = new Timer();
Expand Down Expand Up @@ -255,7 +258,7 @@ public void setControllers(final SettingsController settingsController, final Up

logger.info("Attempting to load the ResourceBundle for locale {}", languageTag);

final Locale locale = Locale.forLanguageTag(languageTag);
final Locale locale = LanguageController.getLocaleFromLanguageTag(languageTag);
resourceFactory.setResources(ResourceBundle.getBundle("translations.OpalApplication", locale));

final boolean mediaButtons = Boolean.parseBoolean(properties.getProperty("mediaButtons", "true"));
Expand Down Expand Up @@ -364,6 +367,37 @@ public void loadMediaButtonVisibility(final boolean visible) {
getSoundPanes(grpCustom).forEach(s -> s.setMediaButton(visible));
}

/**
* Configure the proxy that should be used when checking for updates
*/
private void configureUpdateProxy() {
final Properties properties = settingsController.getProperties();
final boolean proxyEnabled = Boolean.parseBoolean(properties.getProperty("updateProxyEnabled", "false"));
final boolean authenticationEnabled = proxyEnabled && Boolean.parseBoolean(properties.getProperty("updateProxyAuthEnabled", "false"));
final String proxyPort = properties.getProperty("updateProxyPort", "8080").trim();
final int port = proxyPort.isBlank() ? 8080 : Integer.parseInt(proxyPort);

updateController.setProxy(proxyEnabled, properties.getProperty("updateProxyHost", ""), port);
updateController.setProxyAuthentication(
authenticationEnabled,
properties.getProperty("updateProxyUsername", ""),
authenticationEnabled ? decryptProxyPassword(properties.getProperty("updateProxyPassword", "")) : "");
}

/**
* Decrypt the stored proxy password
*
* @param storedPassword The stored password
* @return The decrypted password
*/
private String decryptProxyPassword(final String storedPassword) {
try {
return passwordCipher.decrypt(storedPassword);
} catch (final IOException | GeneralSecurityException ex) {
throw new IllegalArgumentException("Unable to decrypt the proxy password", ex);
}
}

/**
* Check for application updates
*
Expand All @@ -374,6 +408,8 @@ private void checkForUpdates(final boolean showNoUpdates, final boolean showErro
logger.info("Attempting to check for updates");

try {
configureUpdateProxy();

final Optional<PlatformUpdate> platformUpdate = updateController.checkForUpdates(platformName, SharedVariables.PORTABLE);
if (platformUpdate.isPresent()) {
final PlatformUpdate update = platformUpdate.get();
Expand Down Expand Up @@ -413,7 +449,7 @@ private void checkForUpdates(final boolean showNoUpdates, final boolean showErro
FxUtils.showInformationAlert(resourceFactory.getResources().getString("NoUpdateAvailable"), getClass().getResourceAsStream(SharedVariables.ICON_URL));
}
}
} catch (final InterruptedException | IOException | InvalidHttpResponseCodeException | URISyntaxException ex) {
} catch (final InterruptedException | IOException | InvalidHttpResponseCodeException | IllegalArgumentException ex) {
if (ex instanceof InterruptedException)
Thread.currentThread().interrupt();

Expand Down Expand Up @@ -461,6 +497,33 @@ private List<SoundPane> getSoundPanes(final GridPane parent) {
return elements;
}

/**
* Filter the {@link SoundPane} objects in a {@link GridPane} based on a search query
*
* @param gridPane The {@link GridPane} containing the {@link SoundPane} objects
* @param query The trimmed, lower-case query to filter on
*/
private void filterSoundPanes(final GridPane gridPane, final String query) {
getSoundPanes(gridPane).forEach(e -> {
e.setVisible(e.getName().toLowerCase().contains(query));
e.setManaged(e.isVisible());
});
}

/**
* Update the visibility of a {@link TitledPane} based on whether any of its {@link SoundPane} children are visible
*
* @param titledPane The {@link TitledPane} to update
* @param gridPane The {@link GridPane} containing the {@link SoundPane} objects
*/
private void updateTitledPaneVisibility(final TitledPane titledPane, final GridPane gridPane) {
final boolean hasVisibleSoundPane = getSoundPanes(gridPane).stream().anyMatch(Node::isVisible);

titledPane.setExpanded(hasVisibleSoundPane);
titledPane.setVisible(hasVisibleSoundPane);
titledPane.setManaged(hasVisibleSoundPane);
}

/**
* Open a file on the local filesystem
*
Expand Down Expand Up @@ -559,86 +622,25 @@ private void initialize() {
}

Platform.runLater(() -> {
getAllSoundPanes()
.forEach(e -> {
e.setVisible(e.getName().toLowerCase().contains(newValue.trim().toLowerCase()));
e.setManaged(e.isVisible());
});
final String query = newValue.trim().toLowerCase();

getSoundPanes(grpCustom)
.forEach(e -> {
e.setVisible(e.getName().toLowerCase().contains(newValue.trim().toLowerCase()));
e.setManaged(e.isVisible());
});
filterSoundPanes(grpNature, query);
filterSoundPanes(grpOffice, query);
filterSoundPanes(grpAudiences, query);
filterSoundPanes(grpRadioFrequencyStatic, query);
filterSoundPanes(grpOther, query);
filterSoundPanes(grpCustom, query);

// Check if there are still active sound panes on pneCustom
// Hide the TitledPanes that no longer contain any visible SoundPane
final List<SoundPane> customSoundPanes = getSoundPanes(grpCustom);
if (!customSoundPanes.isEmpty()) {
customSoundPanes.stream().filter(Node::isVisible).findFirst().ifPresentOrElse(_ -> {
pneCustom.setExpanded(true);
pneCustom.setVisible(true);
pneCustom.setManaged(true);
}, () -> {
pneCustom.setExpanded(false);
pneCustom.setVisible(false);
pneCustom.setManaged(false);
});
updateTitledPaneVisibility(pneCustom, grpCustom);
}

// Check if there are still active sound panes on pneNature
getSoundPanes(grpNature).stream().filter(Node::isVisible).findFirst().ifPresentOrElse(_ -> {
pneNature.setExpanded(true);
pneNature.setVisible(true);
pneNature.setManaged(true);
}, () -> {
pneNature.setExpanded(false);
pneNature.setVisible(false);
pneNature.setManaged(false);
});

// Check if there are still active sound panes on pneOffice
getSoundPanes(grpOffice).stream().filter(Node::isVisible).findFirst().ifPresentOrElse(_ -> {
pneOffice.setExpanded(true);
pneOffice.setVisible(true);
pneOffice.setManaged(true);
}, () -> {
pneOffice.setExpanded(false);
pneOffice.setVisible(false);
pneOffice.setManaged(false);
});

// Check if there are still active sound panes on pneAudiences
getSoundPanes(grpAudiences).stream().filter(Node::isVisible).findFirst().ifPresentOrElse(_ -> {
pneAudiences.setExpanded(true);
pneAudiences.setVisible(true);
pneAudiences.setManaged(true);
}, () -> {
pneAudiences.setExpanded(false);
pneAudiences.setVisible(false);
pneAudiences.setManaged(false);
});

// Check if there are still active sound panes on pneRadioFrequencyStatic
getSoundPanes(grpRadioFrequencyStatic).stream().filter(Node::isVisible).findFirst().ifPresentOrElse(_ -> {
pneRadioFrequencyStatic.setExpanded(true);
pneRadioFrequencyStatic.setVisible(true);
pneRadioFrequencyStatic.setManaged(true);
}, () -> {
pneRadioFrequencyStatic.setExpanded(false);
pneRadioFrequencyStatic.setVisible(false);
pneRadioFrequencyStatic.setManaged(false);
});

// Check if there are still active sound panes on pneOther
getSoundPanes(grpOther).stream().filter(Node::isVisible).findFirst().ifPresentOrElse(_ -> {
pneOther.setExpanded(true);
pneOther.setVisible(true);
pneOther.setManaged(true);
}, () -> {
pneOther.setExpanded(false);
pneOther.setVisible(false);
pneOther.setManaged(false);
});
updateTitledPaneVisibility(pneNature, grpNature);
updateTitledPaneVisibility(pneOffice, grpOffice);
updateTitledPaneVisibility(pneAudiences, grpAudiences);
updateTitledPaneVisibility(pneRadioFrequencyStatic, grpRadioFrequencyStatic);
updateTitledPaneVisibility(pneOther, grpOther);

btnClearSearch.setVisible(true);
btnClearSearch.setManaged(true);
Expand Down Expand Up @@ -1019,16 +1021,17 @@ public void fired() {
try {
final ProcessBuilder p = new ProcessBuilder(command.split(" "));

try (final BufferedReader reader = new BufferedReader(new InputStreamReader(p.start().getInputStream()))) {
final StringBuilder builder = new StringBuilder();
String line;
while ((line = reader.readLine()) != null) {
builder.append(line);
builder.append(System.lineSeparator());
try (final Process process = p.start()) {
try (final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
final StringBuilder output = new StringBuilder();
String line;
while ((line = reader.readLine()) != null) {
output.append(line).append(System.lineSeparator());
}
logger.info("Shutdown command result: {}", output.toString());
}
final String result = builder.toString();
logger.info("Shutdown command result: {}", result);
}

exitAction();
} catch (final IOException ex) {
logger.error("Unable to execute shutdown command", ex);
Expand Down
Loading
Loading