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

Jump to bottom

fix(agama): avoid assets mess/loss when different projects use the same folder/file names #4516

Merged
merged 1 commit into from
Apr 6, 2023
Merged

fix(agama): avoid assets mess/loss when different projects use the same folder/file names #4516

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
15 changes: 11 additions & 4 deletions jans-auth-server/agama/engine/src/main/java/io/jans/ads/Deployer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@ private void deployProject(String dn, String prjId, String name) throws IOExcept
if (Files.isDirectory(pcode) && Files.isDirectory(pweb)) {

try {
String prjBasepath = prjId;
//To avoid exposing the id in the url one might do: DigestUtils(DigestUtils.getMd5Digest()).digestAsHex(...)
String prjBasepath = makeShortSafePath(prjId);
Set<String> flowIds = createFlows(pcode, dd, prjBasepath);
if (dd.getError() == null) {
projectsFlows.put(prjId, flowIds);
Expand Down Expand Up @@ -227,6 +226,8 @@ private Set<String> createFlows(Path dir, DeploymentDetails dd, String prjBasepa

if (flowsPaths.isEmpty()) {
dd.setError("There are no flows in this archive");
} else {
logger.debug("Flows' basepaths will all be prefixed with '{}'", prjBasepath);
}

Map<String, String> flowsOutcome = new HashMap<>();
Expand Down Expand Up @@ -347,8 +348,8 @@ private ZipFile compileAssetsArchive(Path root, Path webroot, Path lib, String p
logger.info("Compressing to {}", newZipPath);

ZipFile newZip = new ZipFile(newZipPath.toFile());
newZip.addFolder(ftl.toFile(), params);
newZip.addFolder(fl.toFile(), params);
newZip.addFolder(ftl.toFile().getParentFile(), params);
newZip.addFolder(fl.toFile().getParentFile(), params);
newZip.addFolder(scripts.toFile(), params);

return newZip;
Expand Down Expand Up @@ -685,6 +686,12 @@ private String insertProjectBasepath(String code, String basepath) {
}
return code;
}

private String makeShortSafePath(String id) {
//radix 36 entails safe filename/url characters: 0-9 plus a-z
String path = Integer.toString(id.hashCode(), Math.min(36, Character.MAX_RADIX));
return path.substring(path.charAt(0) == '-' ? 1 : 0);
}

@PostConstruct
private void init() {
Expand Down