Skip to content

fix: default gorRoot to absolute CWD instead of the literal string "./" #139

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

Open
gorfather wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: default gorRoot to absolute CWD instead of the literal string "./" #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions gortools/src/main/java/gorsat/process/GorSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.gorpipe.gor.session.GenericFactory;
import org.gorpipe.gor.session.GorSession;

import java.nio.file.Paths;

public abstract class GorSessionFactory extends GenericFactory<GorSession> {

protected static String updateCommonRoot(String commonRootOpt) {
Expand All @@ -33,10 +35,28 @@ protected static String updateCommonRoot(String commonRootOpt) {
}
if (commonRootOpt != null) {
if (commonRootOpt.trim().length() == 0) {
commonRootOpt = "./";
} else if (commonRootOpt.length() > 2 && commonRootOpt.charAt(1) == ':' && !commonRootOpt.endsWith("\\")) { // windows path hack
// Default to the process's actual absolute CWD, not the
// literal string "./" -- resolving a relative path
// against "./" is a no-op in this codebase's URI-based
// path resolution (PathUtils.resolve: resolving anything
// against a relative base just returns it unchanged),
// so anything that needed real anchoring against this
// default quietly stayed relative/un-anchored instead
// (e.g. PGOR's dictionary-folder write caching -- see
// the .gord.link mechanism in GeneralQueryHandler.
// getResultsLinkPath, which silently mis-resolves and
// fails with a "Resource Error" on a fabricated
// version_XXXX.gord name when this root isn't a real,
// absolute path). This value is not used for access-
// control decisions -- the real enforcement path
// (DriverBackedSecureFileReader) always sources its own
// root independently -- so this only affects path-
// resolution/anchoring correctness, not security scoping.
commonRootOpt = Paths.get("").toAbsolutePath().toString();
}
if (commonRootOpt.length() > 2 && commonRootOpt.charAt(1) == ':' && !commonRootOpt.endsWith("\\")) { // windows path hack
commonRootOpt = commonRootOpt + '\\';
} else if (!commonRootOpt.endsWith("/")) {
} else if (!commonRootOpt.endsWith("/") && !commonRootOpt.endsWith("\\")) {
commonRootOpt = commonRootOpt + '/';
}
}
Expand Down
13 changes: 12 additions & 1 deletion model/src/main/java/org/gorpipe/gor/model/DriverBackedFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,18 @@ public class DriverBackedFileReader extends FileReader {

private static final Logger log = LoggerFactory.getLogger(DriverBackedFileReader.class);

private static final String DEFAULT_COMMON_ROOT = "./";
// The process's actual absolute CWD, not the literal string "./" --
// resolving a relative path against "./" is a no-op in this
// codebase's URI-based path resolution (PathUtils.resolve), so
// anything needing real anchoring against this default (e.g. PGOR's
// dictionary-folder write caching -- see GorSessionFactory.
// updateCommonRoot()'s own matching fix and docstring) quietly
// stayed relative/un-anchored instead. Not used for access-control
// decisions -- this class's own validateAccess() is a no-op, and the
// real enforcement path (DriverBackedSecureFileReader) always
// sources its root independently -- so this only affects path-
// resolution/anchoring correctness, not security scoping.
private static final String DEFAULT_COMMON_ROOT = PathUtils.markAsFolder(Paths.get("").toAbsolutePath().toString());

final static int GZIP_BUFFER_SIZE = Integer.parseInt(System.getProperty("gor.gzip.buffer.size", "2046"));

Expand Down