Commit 93f7a142 authored by Paff's avatar Paff
Browse files

changes caused by last commit

configuration of tool and test 
parent 5db3a778
...@@ -9,7 +9,6 @@ import com.google.inject.Injector; ...@@ -9,7 +9,6 @@ import com.google.inject.Injector;
import interfaces2.language.ETSTool; import interfaces2.language.ETSTool;
import interfaces2.language.LanguageFamily; import interfaces2.language.LanguageFamily;
import mc.MCG;
import mc.ProblemReport.Type; import mc.ProblemReport.Type;
import mc.umlp.arcd.InjectorProvider; import mc.umlp.arcd.InjectorProvider;
import secarc.ets.check.MontiSecArcAnalysisCreator; import secarc.ets.check.MontiSecArcAnalysisCreator;
......
...@@ -308,7 +308,7 @@ public class MontiSecArcAnalysisTest extends TestWithSymtabAnalysis<MontiSecArcA ...@@ -308,7 +308,7 @@ public class MontiSecArcAnalysisTest extends TestWithSymtabAnalysis<MontiSecArcA
tool.init(); tool.init();
assertTrue(tool.run()); assertTrue(tool.run());
assertEquals(6, handler.getWarnings().size()); assertEquals(5, handler.getWarnings().size());
for(ProblemReport error : handler.getErrors()) { for(ProblemReport error : handler.getErrors()) {
assertTrue(errorCodes.contains(error.getErrorcode())); assertTrue(errorCodes.contains(error.getErrorcode()));
} }
......
...@@ -64,7 +64,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly ...@@ -64,7 +64,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool.init(); tool.init();
assertTrue(tool.run()); assertTrue(tool.run());
assertEquals(7, handler.getWarnings().size()); assertEquals(8, handler.getWarnings().size());
for(ProblemReport error : handler.getErrors()) { for(ProblemReport error : handler.getErrors()) {
assertTrue(errorCodes.contains(error.getErrorcode())); assertTrue(errorCodes.contains(error.getErrorcode()));
} }
...@@ -77,7 +77,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly ...@@ -77,7 +77,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool.init(); tool.init();
assertTrue(tool.run()); assertTrue(tool.run());
assertEquals(4, handler.getWarnings().size()); assertEquals(5, handler.getWarnings().size());
for(ProblemReport error : handler.getErrors()) { for(ProblemReport error : handler.getErrors()) {
assertTrue(errorCodes.contains(error.getErrorcode())); assertTrue(errorCodes.contains(error.getErrorcode()));
} }
...@@ -113,7 +113,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly ...@@ -113,7 +113,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool.init(); tool.init();
assertTrue(tool.run()); assertTrue(tool.run());
assertEquals(3, handler.getWarnings().size()); assertEquals(6, handler.getWarnings().size());
for(ProblemReport error : handler.getErrors()) { for(ProblemReport error : handler.getErrors()) {
assertTrue(errorCodes.contains(error.getErrorcode())); assertTrue(errorCodes.contains(error.getErrorcode()));
} }
...@@ -175,7 +175,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly ...@@ -175,7 +175,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
errorCodes.add(MontiSecArcAnalysisErrorCodes.RoleAccess); errorCodes.add(MontiSecArcAnalysisErrorCodes.RoleAccess);
errorCodes.add(MontiSecArcAnalysisErrorCodes.ListThirdPartyComponents); errorCodes.add(MontiSecArcAnalysisErrorCodes.ListThirdPartyComponents);
assertEquals(13, handler.getWarnings().size()); assertEquals(16, handler.getWarnings().size());
for(ProblemReport error : handler.getErrors()) { for(ProblemReport error : handler.getErrors()) {
assertTrue(errorCodes.contains(error.getErrorcode())); assertTrue(errorCodes.contains(error.getErrorcode()));
} }
...@@ -259,7 +259,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly ...@@ -259,7 +259,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool.init(); tool.init();
assertTrue(tool.run()); assertTrue(tool.run());
assertEquals(6, handler.getWarnings().size()); assertEquals(5, handler.getWarnings().size());
for(ProblemReport error : handler.getErrors()) { for(ProblemReport error : handler.getErrors()) {
assertTrue(errorCodes.contains(error.getErrorcode())); assertTrue(errorCodes.contains(error.getErrorcode()));
} }
......
...@@ -59,7 +59,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends ...@@ -59,7 +59,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB,
ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB,
ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK,
ARG_SYNTHESIS, "arcd", WF_PRE_CHECK_TRAFO, ARG_SYNTHESIS, "secarc", WF_PRE_CHECK_TRAFO,
ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK,
//Uses analysis workflow //Uses analysis workflow
ARG_SYNTHESIS, "secarc", MontiSecArcConstants.ANALYSIS_WORKFLOW_BEGINNERS,}; ARG_SYNTHESIS, "secarc", MontiSecArcConstants.ANALYSIS_WORKFLOW_BEGINNERS,};
...@@ -104,7 +104,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends ...@@ -104,7 +104,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB,
ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB,
ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK,
ARG_SYNTHESIS, "arcd", WF_PRE_CHECK_TRAFO, ARG_SYNTHESIS, "secarc", WF_PRE_CHECK_TRAFO,
ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK,
//Uses analysis workflow //Uses analysis workflow
ARG_SYNTHESIS, "secarc", MontiSecArcConstants.FILTER_TRUSTLEVEL, ARG_SYNTHESIS, "secarc", MontiSecArcConstants.FILTER_TRUSTLEVEL,
...@@ -149,7 +149,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends ...@@ -149,7 +149,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB,
ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB,
ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK,
ARG_SYNTHESIS, "arcd", WF_PRE_CHECK_TRAFO, ARG_SYNTHESIS, "secarc", WF_PRE_CHECK_TRAFO,
ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK,
//Uses analysis workflow //Uses analysis workflow
ARG_SYNTHESIS, "secarc", MontiSecArcConstants.FILTER_CRITICAL_PORT, ARG_SYNTHESIS, "secarc", MontiSecArcConstants.FILTER_CRITICAL_PORT,
...@@ -195,7 +195,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends ...@@ -195,7 +195,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB,
ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB,
ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK,
ARG_SYNTHESIS, "arcd", WF_PRE_CHECK_TRAFO, ARG_SYNTHESIS, "secarc", WF_PRE_CHECK_TRAFO,
ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK,
//Uses analysis workflow //Uses analysis workflow
ARG_SYNTHESIS, "secarc", MontiSecArcConstants.FILTER_TRUSTLEVEL, ARG_SYNTHESIS, "secarc", MontiSecArcConstants.FILTER_TRUSTLEVEL,
...@@ -242,7 +242,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends ...@@ -242,7 +242,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_INIT_SYMTAB,
ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB, ARG_ANALYSIS, Parameters.ALL, WF_CREATE_SYMTAB,
ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_INIT_CHECK,
ARG_SYNTHESIS, "arcd", WF_PRE_CHECK_TRAFO, ARG_SYNTHESIS, "secarc", WF_PRE_CHECK_TRAFO,
ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK, ARG_SYNTHESIS, Parameters.ALL, WF_RUN_CHECK,
//Prepare parameter //Prepare parameter
ARG_SYNTHESIS, "secarc", MontiSecArcConstants.PREPARE_PARAMETER, ARG_SYNTHESIS, "secarc", MontiSecArcConstants.PREPARE_PARAMETER,
......
...@@ -20,6 +20,8 @@ component EncryptedPathEndInLowTrustlevel { ...@@ -20,6 +20,8 @@ component EncryptedPathEndInLowTrustlevel {
trustlevel +1; trustlevel +1;
} }
connect encrypted subEncryptedConnector.inputSub2 -> targetHelp.inputTarget;
component SubEncryptedConnector subEncryptedConnector { component SubEncryptedConnector subEncryptedConnector {
...@@ -27,8 +29,7 @@ component EncryptedPathEndInLowTrustlevel { ...@@ -27,8 +29,7 @@ component EncryptedPathEndInLowTrustlevel {
port port
out int inputSub2; out int inputSub2;
connect encrypted inputSub2 -> targetHelp.inputTarget;
} }
} }
\ No newline at end of file
...@@ -18,6 +18,8 @@ component EncryptedPathWithLowerTrustlevel { ...@@ -18,6 +18,8 @@ component EncryptedPathWithLowerTrustlevel {
} }
connect encrypted subEncryptedConnector.inputSub2 -> targetHelp.inputTarget;
component SubEncryptedConnector subEncryptedConnector { component SubEncryptedConnector subEncryptedConnector {
trustlevel +0; trustlevel +0;
...@@ -25,7 +27,6 @@ component EncryptedPathWithLowerTrustlevel { ...@@ -25,7 +27,6 @@ component EncryptedPathWithLowerTrustlevel {
port port
out int inputSub2; out int inputSub2;
connect encrypted inputSub2 -> targetHelp.inputTarget;
} }
......
...@@ -32,8 +32,9 @@ component EncryptedPathWithUnencryptedPart { ...@@ -32,8 +32,9 @@ component EncryptedPathWithUnencryptedPart {
in int inputSub, in int inputSub,
out int inputSub2; out int inputSub2;
connect inputSub2 -> targetHelp.inputTarget;
} }
connect subEncryptedConnector.inputSub2 -> targetHelp.inputTarget;
connect encrypted input -> subEncryptedConnector.inputSub; connect encrypted input -> subEncryptedConnector.inputSub;
......
...@@ -28,8 +28,9 @@ component UnencryptedPathThroughLowTrustlevel { ...@@ -28,8 +28,9 @@ component UnencryptedPathThroughLowTrustlevel {
port port
out int inputSub2; out int inputSub2;
connect inputSub2 -> targetHelp.inputTarget;
} }
connect subEncryptedConnector.inputSub2 -> targetHelp.inputTarget;
} }
\ No newline at end of file
...@@ -23,8 +23,8 @@ component FilterComponent { ...@@ -23,8 +23,8 @@ component FilterComponent {
port in int input; port in int input;
connect encrypted targetHelp.output -> filterURL.input;
} }
connect encrypted targetHelp.output -> filterURL.input;
} }
\ No newline at end of file
...@@ -9,6 +9,10 @@ component FilterPort { ...@@ -9,6 +9,10 @@ component FilterPort {
component Help help { component Help help {
trustlevel +1; trustlevel +1;
port
out int output;
} }
component TargetHelp targetHelp { component TargetHelp targetHelp {
...@@ -19,4 +23,6 @@ component FilterPort { ...@@ -19,4 +23,6 @@ component FilterPort {
(filter sql) in int input; (filter sql) in int input;
} }
connect encrypted help.output -> targetHelp.input;
} }
\ No newline at end of file
...@@ -20,9 +20,9 @@ component FilterWithLowerTrustlevel { ...@@ -20,9 +20,9 @@ component FilterWithLowerTrustlevel {
component (filter url) FilterURL filterURL { component (filter url) FilterURL filterURL {
port in int input; port in int input;
connect encrypted targetHelp.output -> filterURL.input;
} }
connect encrypted targetHelp.output -> filterURL.input;
} }
\ No newline at end of file
...@@ -16,8 +16,6 @@ component IdentityWithoutConnector { ...@@ -16,8 +16,6 @@ component IdentityWithoutConnector {
component TargetHelp targetHelp { component TargetHelp targetHelp {
port in int inputTarget;
trustlevel +1; trustlevel +1;
} }
...@@ -28,8 +26,6 @@ component IdentityWithoutConnector { ...@@ -28,8 +26,6 @@ component IdentityWithoutConnector {
access user; access user;
port
in int inputSub;
} }
} }
\ No newline at end of file
...@@ -9,9 +9,14 @@ component IncomingPort { ...@@ -9,9 +9,14 @@ component IncomingPort {
port port
in int input; in int input;
connect input -> help.phelp;
component Help help { component Help help {
trustlevel +1; trustlevel +1;
port in int phelp;
} }
component TargetHelp targetHelp { component TargetHelp targetHelp {
......
...@@ -9,9 +9,13 @@ component OutgoingPort { ...@@ -9,9 +9,13 @@ component OutgoingPort {
port port
out int output; out int output;
connect help.phelp -> output;
component Help help { component Help help {
trustlevel +1; trustlevel +1;
port out int phelp;
} }
......
...@@ -9,9 +9,14 @@ component DerivedThirdPartyRoles { ...@@ -9,9 +9,14 @@ component DerivedThirdPartyRoles {
identity weak help -> targetHelp; identity weak help -> targetHelp;
identity weak targetHelp -> targetHelp.targetHelpHelp; identity weak targetHelp -> targetHelp.targetHelpHelp;
connect encrypted help.outputHelp -> targetHelp.inputTarget;
component Help help { component Help help {
trustlevel +1; trustlevel +1;
port out int outputHelp;
} }
component TargetHelp targetHelp { component TargetHelp targetHelp {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment