Merge pull request #397 from rakshitkr/read-latest-ruleset-fix

Fix reading rulesets from eclipse installation directory

Author: kruegers

plugins/de.cognicrypt.codegenerator/src/main/java/de/cognicrypt/codegenerator/ui/contentassist/CustomCompletionProposalComputer.java

@@ -17,13 +17,17 @@
 
 import de.cognicrypt.codegenerator.Activator;
 import de.cognicrypt.core.Constants;
+import de.cognicrypt.utils.CrySLUtils;
 
 
 @SuppressWarnings("restriction")
 public class CustomCompletionProposalComputer extends JavaCompletionProposalComputer {
 
+	static String JCA_LATEST_ECLIPSE_RULES_DIR = Constants.ECLIPSE_RULES_DIR + Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + 
+		CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString())[CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString()).length - 1] + 
+		Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString();
 
-	static private List<String> ruleNames = readClassnames(Constants.JCA_LATEST_ECLIPSE_RULES_DIR);
+	static private List<String> ruleNames = readClassnames(JCA_LATEST_ECLIPSE_RULES_DIR);
 
 	@Override
 	public List<ICompletionProposal> computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {

plugins/de.cognicrypt.core/src/de/cognicrypt/core/Constants.java

@@ -7,11 +7,10 @@
 
 package de.cognicrypt.core;
 
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
-import de.cognicrypt.utils.CrySLUtils;
-
 /**
  * This class comprises all constants that are used by the plugin.
  */
@@ -582,11 +581,7 @@ public String toString() {
 	// define a correct ID (get range of possible ones)
 	public static final int JDT_PROBLEM_ID = 10000000;
 	public final static String RELATIVE_RULES_DIR = "resources/CrySLRules";
-	public final static String ECLIPSE_RULES_DIR = System.getProperty("user.dir");
-	public final static String JCA_LATEST_ECLIPSE_RULES_DIR = Constants.ECLIPSE_RULES_DIR + Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + 
-			CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString())[CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString()).length - 1] + 
-			Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString();
-			
+	public final static String ECLIPSE_RULES_DIR = Platform.getInstallLocation().getURL().getPath() + RELATIVE_RULES_DIR;
 	public static final String cryslFileEnding = ".crysl";
 	public static final String cryslEditorID = "de.darmstadt.tu.crossing.CrySL";
 	public static final String HEALTHY = "Secure";

plugins/de.cognicrypt.core/src/de/cognicrypt/utils/CrySLUtils.java

@@ -21,6 +21,10 @@
 import de.cognicrypt.core.Constants;
 
 public class CrySLUtils {
+	
+	static String JCA_LATEST_ECLIPSE_RULES_DIR = Constants.ECLIPSE_RULES_DIR + Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + 
+			CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString())[CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString()).length - 1] + 
+			Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString();
 
 	public static List<TransitionEdge> getOutgoingEdges(Collection<TransitionEdge> collection, final StateNode curNode, final StateNode notTo) {
 		final List<TransitionEdge> outgoingEdges = new ArrayList<>();
@@ -60,7 +64,7 @@ protected static List<CrySLRule> readCrySLRules(String rulesFolder) {
 
 	public static List<CrySLRule> readCrySLRules() {
 		return Stream.of(readCrySLRules(Utils.getResourceFromWithin(Constants.RELATIVE_RULES_DIR).getAbsolutePath()),
-				readCrySLRules(Constants.ECLIPSE_RULES_DIR + Constants.outerFileSeparator + "JavaCryptographicArchitecture")).flatMap(Collection::stream).collect(Collectors.toList());
+				readCrySLRules(JCA_LATEST_ECLIPSE_RULES_DIR)).flatMap(Collection::stream).collect(Collectors.toList());
 	}
 
 	/**
@@ -72,7 +76,7 @@ public static List<CrySLRule> readCrySLRules() {
 	 */
 
 	public static CrySLRule getCrySLRule(String cryslRule) throws MalformedURLException {
-		File ruleRes = new File(Constants.JCA_LATEST_ECLIPSE_RULES_DIR + Constants.innerFileSeparator + cryslRule + RuleFormat.SOURCE.toString());
+		File ruleRes = new File(JCA_LATEST_ECLIPSE_RULES_DIR + Constants.innerFileSeparator + cryslRule + RuleFormat.SOURCE.toString());
 		if (ruleRes == null || !ruleRes.exists() || !ruleRes.canRead()) {
 			ruleRes = Utils.getResourceFromWithin(Constants.RELATIVE_CUSTOM_RULES_DIR + Constants.innerFileSeparator + cryslRule + RuleFormat.SOURCE.toString(), de.cognicrypt.core.Activator.PLUGIN_ID);
 		}
@@ -86,7 +90,7 @@ public static CrySLRule getCrySLRule(String cryslRule) throws MalformedURLExcept
 	 */
 	public static String[] getRuleVersions(String ruleSet){
 		List<String> versions = new ArrayList<String>();
-		File path = new File(System.getProperty("user.dir") + File.separator + ruleSet);
+		File path = new File(Constants.ECLIPSE_RULES_DIR + File.separator + ruleSet);
 		File[] innerDirs = path.listFiles();
 		if (innerDirs == null) {
 			return null;

plugins/de.cognicrypt.staticanalyzer/src/de/cognicrypt/staticanalyzer/utilities/ArtifactUtils.java

@@ -148,7 +148,7 @@ public void characters(char ch[], int start, int length) throws SAXException {
 			DefaultArtifactVersion min = new DefaultArtifactVersion(minVersion.toString());
 			DefaultArtifactVersion cur = new DefaultArtifactVersion(version);
 			if (cur.compareTo(min) >= 0) {
-				downloadRulesetArtifact(groupId[0], artifactId[0], version, new File(System.getProperty("user.dir")));
+				downloadRulesetArtifact(groupId[0], artifactId[0], version, new File(Constants.ECLIPSE_RULES_DIR));
 			}
 		}
 	}