Skip to content

convert LDAP authorization plugin configuration to YAML #4599

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

Merged
merged 8 commits into from
Aug 12, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
quote paths
  • Loading branch information
vladak committed Aug 12, 2024
commit c95c0759806b9104d2f59356bdf18d94ca7fa39f
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,12 @@ private String getClassName(JarEntry jarEntry) {
File file = new File(pluginDirectory.getAbsolutePath(), filePath);
try {
if (!file.getCanonicalPath().startsWith(pluginDirectory.getCanonicalPath() + File.separator)) {
LOGGER.log(Level.WARNING, "canonical path for jar entry {0} leads outside the origin", filePath);
LOGGER.log(Level.WARNING, "canonical path for jar entry ''{0}'' leads outside the origin",
filePath);
return null;
}
} catch (IOException e) {
LOGGER.log(Level.WARNING, "failed to get canonical path for {0}", file);
LOGGER.log(Level.WARNING, "failed to get canonical path for ''{0}''", file);
return null;
}

Expand Down Expand Up @@ -372,12 +373,12 @@ private String getClassName(JarEntry jarEntry) {
*/
public final void reload() {
if (pluginDirectory == null || !pluginDirectory.isDirectory() || !pluginDirectory.canRead()) {
LOGGER.log(Level.WARNING, "Plugin directory not found or not readable: {0}. "
LOGGER.log(Level.WARNING, "Plugin directory ''{0}'' not found or not readable: "
+ "All requests allowed.", pluginDirectory);
return;
}

LOGGER.log(Level.INFO, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath());
LOGGER.log(Level.INFO, "Plugins are being reloaded from ''{0}''", pluginDirectory.getAbsolutePath());

// trashing out the old instance of the loader enables us
// to reload the stack at runtime
Expand Down