From b70025bec57240f348b39bb5957d523ae73bb2ec Mon Sep 17 00:00:00 2001 From: David Russell Date: Wed, 1 Apr 2015 00:38:38 +0100 Subject: [PATCH] RW-754: Updated self-signed SSL cert support. Ensure generated URLs associated with repository-managed files within RRepositoryFileDetails maintain access rights within the context of the current HTTP session. --- .../deployr/client/core/impl/RProjectFileImpl.java | 2 +- .../deployr/client/core/impl/RProjectImpl.java | 2 +- .../client/core/impl/RRepositoryFileImpl.java | 8 ++++---- .../revo/deployr/client/core/impl/RUserImpl.java | 12 ++++++------ .../com/revo/deployr/client/util/REntityUtil.java | 14 +++++++++----- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/revo/deployr/client/core/impl/RProjectFileImpl.java b/src/main/java/com/revo/deployr/client/core/impl/RProjectFileImpl.java index 0c10496..8a419d4 100644 --- a/src/main/java/com/revo/deployr/client/core/impl/RProjectFileImpl.java +++ b/src/main/java/com/revo/deployr/client/core/impl/RProjectFileImpl.java @@ -96,7 +96,7 @@ public RRepositoryFile store(RepoUploadOptions options) Map repoFileMap = rResult.getRepoFile(); log.debug("uploadFile: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); diff --git a/src/main/java/com/revo/deployr/client/core/impl/RProjectImpl.java b/src/main/java/com/revo/deployr/client/core/impl/RProjectImpl.java index 963a8c9..a89c11d 100644 --- a/src/main/java/com/revo/deployr/client/core/impl/RProjectImpl.java +++ b/src/main/java/com/revo/deployr/client/core/impl/RProjectImpl.java @@ -841,7 +841,7 @@ public RRepositoryFile storeObject(String name, String descr, boolean versioning Map repoFileMap = rResult.getRepoFile(); log.debug("storeObject: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); diff --git a/src/main/java/com/revo/deployr/client/core/impl/RRepositoryFileImpl.java b/src/main/java/com/revo/deployr/client/core/impl/RRepositoryFileImpl.java index aea9118..5b0b62d 100644 --- a/src/main/java/com/revo/deployr/client/core/impl/RRepositoryFileImpl.java +++ b/src/main/java/com/revo/deployr/client/core/impl/RRepositoryFileImpl.java @@ -75,7 +75,7 @@ public List versions() for(Map repoFileMap : repoFiles) { - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile file = new RRepositoryFileImpl(details, liveContext); versionList.add(file); } @@ -101,7 +101,7 @@ public RRepositoryFile grant(String newauthor, String revokeauthor) Map repoFileMap = rResult.getRepoFile(); log.debug("grant: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); @@ -122,7 +122,7 @@ public RRepositoryFile revert(RRepositoryFile fileVersion, String descr, String Map repoFileMap = rResult.getRepoFile(); log.debug("revert: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); @@ -148,7 +148,7 @@ public RRepositoryFile update(String restricted, boolean shared, boolean publish Map repoFileMap = rResult.getRepoFile(); log.debug("update: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); diff --git a/src/main/java/com/revo/deployr/client/core/impl/RUserImpl.java b/src/main/java/com/revo/deployr/client/core/impl/RUserImpl.java index d738f9a..2113c93 100644 --- a/src/main/java/com/revo/deployr/client/core/impl/RUserImpl.java +++ b/src/main/java/com/revo/deployr/client/core/impl/RUserImpl.java @@ -431,7 +431,7 @@ private List listRepoFiles(boolean archived, for(Map repoFileMap : repoFiles) { - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile file = new RRepositoryFileImpl(details, liveContext); fileList.add(file); } @@ -456,7 +456,7 @@ public RRepositoryFile fetchFile(String filename, Map repoFileMap = rResult.getRepoFile(); log.debug("fetchFile: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); boolean success = rResult.isSuccess(); @@ -477,7 +477,7 @@ public RRepositoryFile uploadFile(InputStream fileStream, Map repoFileMap = rResult.getRepoFile(); log.debug("uploadFile: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); boolean success = rResult.isSuccess(); @@ -497,7 +497,7 @@ public RRepositoryFile writeFile(String text, RepoUploadOptions options) Map repoFileMap = rResult.getRepoFile(); log.debug("writeFile: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); @@ -518,7 +518,7 @@ public RRepositoryFile transferFile(URL url, RepoUploadOptions options) Map repoFileMap = rResult.getRepoFile(); log.debug("transferFile: rResult.getRepoFile=" + repoFileMap); - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); @@ -657,7 +657,7 @@ private List listRepoScripts(boolean archived, for(Map repoScriptMap : repoScripts) { RRepositoryFileDetails details = - REntityUtil.getRepositoryFileDetails(repoScriptMap); + REntityUtil.getRepositoryFileDetails(repoScriptMap, liveContext); RRepositoryFile script = new RRepositoryFileImpl(details, liveContext); scriptList.add(script); diff --git a/src/main/java/com/revo/deployr/client/util/REntityUtil.java b/src/main/java/com/revo/deployr/client/util/REntityUtil.java index 20193fc..f189e32 100644 --- a/src/main/java/com/revo/deployr/client/util/REntityUtil.java +++ b/src/main/java/com/revo/deployr/client/util/REntityUtil.java @@ -75,7 +75,8 @@ public static RProjectDetails getProjectDetails(Map project) { return projectDetails; } - public static RRepositoryFileDetails getRepositoryFileDetails(Map repoFile) { + public static RRepositoryFileDetails getRepositoryFileDetails(Map repoFile, + RLiveContext liveContext) { String filename = (String) repoFile.get("filename"); String directory = (String) repoFile.get("directory"); @@ -85,6 +86,7 @@ public static RRepositoryFileDetails getRepositoryFileDetails(Map repoFile) { String descr = (String) repoFile.get("descr"); String type = (String) repoFile.get("type"); String urlString = (String) repoFile.get("url"); + urlString = urlString + ";jsessionid=" + liveContext.httpcookie; String tags = (String) repoFile.get("tags"); RRepositoryFile.Category category = null; @@ -151,7 +153,7 @@ public static RRepositoryDirectoryDetails getRepositoryDirectoryDetails(Map dire if (files != null) { for (Map repoFileMap : files) { - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); repoList.add(repoFile); } @@ -250,7 +252,8 @@ public static RProjectExecutionDetails getProjectExecutionDetails(RProjectDetail if (results != null) { for (Map resultMap : results) { - RProjectResultDetails details = REntityUtil.getProjectResultDetails(resultMap); + RProjectResultDetails details = + REntityUtil.getProjectResultDetails(resultMap); RProjectResult projectResult = new RProjectResultImpl(project, details, liveContext); resultList.add(projectResult); @@ -264,7 +267,8 @@ public static RProjectExecutionDetails getProjectExecutionDetails(RProjectDetail if (artifacts != null) { for (Map artifactMap : artifacts) { - RProjectFileDetails details = REntityUtil.getProjectFileDetails(artifactMap); + RProjectFileDetails details = + REntityUtil.getProjectFileDetails(artifactMap); RProjectFile projectFile = new RProjectFileImpl(project, details, liveContext); artifactList.add(projectFile); @@ -276,7 +280,7 @@ public static RProjectExecutionDetails getProjectExecutionDetails(RProjectDetail if (repofiles != null) { for (Map repoFileMap : repofiles) { - RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap); + RRepositoryFileDetails details = REntityUtil.getRepositoryFileDetails(repoFileMap, liveContext); RRepositoryFile repoFile = new RRepositoryFileImpl(details, liveContext); repoList.add(repoFile); }