Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
MontiSecArc
Commits
93f7a142
Commit
93f7a142
authored
Dec 05, 2014
by
Paff
Browse files
changes caused by last commit
configuration of tool and test
parent
5db3a778
Changes
15
Hide whitespace changes
Inline
Side-by-side
montiSecArcAnalysis/src/main/java/secarc/MontiSecArcAnalysisTool.java
View file @
93f7a142
...
...
@@ -9,7 +9,6 @@ import com.google.inject.Injector;
import
interfaces2.language.ETSTool
;
import
interfaces2.language.LanguageFamily
;
import
mc.MCG
;
import
mc.ProblemReport.Type
;
import
mc.umlp.arcd.InjectorProvider
;
import
secarc.ets.check.MontiSecArcAnalysisCreator
;
...
...
montiSecArcAnalysis/src/test/java/secarc/MontiSecArcAnalysisTest.java
View file @
93f7a142
...
...
@@ -308,7 +308,7 @@ public class MontiSecArcAnalysisTest extends TestWithSymtabAnalysis<MontiSecArcA
tool
.
init
();
assertTrue
(
tool
.
run
());
assertEquals
(
6
,
handler
.
getWarnings
().
size
());
assertEquals
(
5
,
handler
.
getWarnings
().
size
());
for
(
ProblemReport
error
:
handler
.
getErrors
())
{
assertTrue
(
errorCodes
.
contains
(
error
.
getErrorcode
()));
}
...
...
montiSecArcAnalysis/src/test/java/secarc/MontiSecArcAnalysisWhatIfTrustlevelTest.java
View file @
93f7a142
...
...
@@ -64,7 +64,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool
.
init
();
assertTrue
(
tool
.
run
());
assertEquals
(
7
,
handler
.
getWarnings
().
size
());
assertEquals
(
8
,
handler
.
getWarnings
().
size
());
for
(
ProblemReport
error
:
handler
.
getErrors
())
{
assertTrue
(
errorCodes
.
contains
(
error
.
getErrorcode
()));
}
...
...
@@ -77,7 +77,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool
.
init
();
assertTrue
(
tool
.
run
());
assertEquals
(
4
,
handler
.
getWarnings
().
size
());
assertEquals
(
5
,
handler
.
getWarnings
().
size
());
for
(
ProblemReport
error
:
handler
.
getErrors
())
{
assertTrue
(
errorCodes
.
contains
(
error
.
getErrorcode
()));
}
...
...
@@ -113,7 +113,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool
.
init
();
assertTrue
(
tool
.
run
());
assertEquals
(
3
,
handler
.
getWarnings
().
size
());
assertEquals
(
6
,
handler
.
getWarnings
().
size
());
for
(
ProblemReport
error
:
handler
.
getErrors
())
{
assertTrue
(
errorCodes
.
contains
(
error
.
getErrorcode
()));
}
...
...
@@ -175,7 +175,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
errorCodes
.
add
(
MontiSecArcAnalysisErrorCodes
.
RoleAccess
);
errorCodes
.
add
(
MontiSecArcAnalysisErrorCodes
.
ListThirdPartyComponents
);
assertEquals
(
1
3
,
handler
.
getWarnings
().
size
());
assertEquals
(
1
6
,
handler
.
getWarnings
().
size
());
for
(
ProblemReport
error
:
handler
.
getErrors
())
{
assertTrue
(
errorCodes
.
contains
(
error
.
getErrorcode
()));
}
...
...
@@ -259,7 +259,7 @@ public class MontiSecArcAnalysisWhatIfTrustlevelTest extends TestWithSymtabAnaly
tool
.
init
();
assertTrue
(
tool
.
run
());
assertEquals
(
6
,
handler
.
getWarnings
().
size
());
assertEquals
(
5
,
handler
.
getWarnings
().
size
());
for
(
ProblemReport
error
:
handler
.
getErrors
())
{
assertTrue
(
errorCodes
.
contains
(
error
.
getErrorcode
()));
}
...
...
montiSecArcAnalysis/src/test/java/secarc/TestWithSymtabAnalysis.java
View file @
93f7a142
...
...
@@ -59,7 +59,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_INIT_SYMTAB
,
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_CREATE_SYMTAB
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_INIT_CHECK
,
ARG_SYNTHESIS
,
"arc
d
"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
"
sec
arc"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_RUN_CHECK
,
//Uses analysis workflow
ARG_SYNTHESIS
,
"secarc"
,
MontiSecArcConstants
.
ANALYSIS_WORKFLOW_BEGINNERS
,};
...
...
@@ -104,7 +104,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_INIT_SYMTAB
,
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_CREATE_SYMTAB
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_INIT_CHECK
,
ARG_SYNTHESIS
,
"arc
d
"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
"
sec
arc"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_RUN_CHECK
,
//Uses analysis workflow
ARG_SYNTHESIS
,
"secarc"
,
MontiSecArcConstants
.
FILTER_TRUSTLEVEL
,
...
...
@@ -149,7 +149,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_INIT_SYMTAB
,
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_CREATE_SYMTAB
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_INIT_CHECK
,
ARG_SYNTHESIS
,
"arc
d
"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
"
sec
arc"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_RUN_CHECK
,
//Uses analysis workflow
ARG_SYNTHESIS
,
"secarc"
,
MontiSecArcConstants
.
FILTER_CRITICAL_PORT
,
...
...
@@ -195,7 +195,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_INIT_SYMTAB
,
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_CREATE_SYMTAB
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_INIT_CHECK
,
ARG_SYNTHESIS
,
"arc
d
"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
"
sec
arc"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_RUN_CHECK
,
//Uses analysis workflow
ARG_SYNTHESIS
,
"secarc"
,
MontiSecArcConstants
.
FILTER_TRUSTLEVEL
,
...
...
@@ -242,7 +242,7 @@ public class TestWithSymtabAnalysis<T extends ETSTool> extends
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_INIT_SYMTAB
,
ARG_ANALYSIS
,
Parameters
.
ALL
,
WF_CREATE_SYMTAB
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_INIT_CHECK
,
ARG_SYNTHESIS
,
"arc
d
"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
"
sec
arc"
,
WF_PRE_CHECK_TRAFO
,
ARG_SYNTHESIS
,
Parameters
.
ALL
,
WF_RUN_CHECK
,
//Prepare parameter
ARG_SYNTHESIS
,
"secarc"
,
MontiSecArcConstants
.
PREPARE_PARAMETER
,
...
...
montiSecArcAnalysis/src/test/resources/secarc/analysis/connector/EncryptedPathEndInLowTrustlevel.secarc
View file @
93f7a142
...
...
@@ -20,6 +20,8 @@ component EncryptedPathEndInLowTrustlevel {
trustlevel
+
1
;
}
connect
encrypted
subEncryptedConnector
.
inputSub2
->
targetHelp
.
inputTarget
;
component
SubEncryptedConnector
subEncryptedConnector
{
...
...
@@ -27,8 +29,7 @@ component EncryptedPathEndInLowTrustlevel {
port
out
int
inputSub2
;
connect
encrypted
inputSub2
->
targetHelp
.
inputTarget
;
}
}
\ No newline at end of file
montiSecArcAnalysis/src/test/resources/secarc/analysis/connector/EncryptedPathWithLowerTrustlevel.secarc
View file @
93f7a142
...
...
@@ -18,6 +18,8 @@ component EncryptedPathWithLowerTrustlevel {
}
connect
encrypted
subEncryptedConnector
.
inputSub2
->
targetHelp
.
inputTarget
;
component
SubEncryptedConnector
subEncryptedConnector
{
trustlevel
+
0
;
...
...
@@ -25,7 +27,6 @@ component EncryptedPathWithLowerTrustlevel {
port
out
int
inputSub2
;
connect
encrypted
inputSub2
->
targetHelp
.
inputTarget
;
}
...
...
montiSecArcAnalysis/src/test/resources/secarc/analysis/connector/EncryptedPathWithUnencryptedPart.secarc
View file @
93f7a142
...
...
@@ -32,8 +32,9 @@ component EncryptedPathWithUnencryptedPart {
in
int
inputSub
,
out
int
inputSub2
;
connect
inputSub2
->
targetHelp
.
inputTarget
;
}
connect
subEncryptedConnector
.
inputSub2
->
targetHelp
.
inputTarget
;
connect
encrypted
input
->
subEncryptedConnector
.
inputSub
;
...
...
montiSecArcAnalysis/src/test/resources/secarc/analysis/connector/UnencryptedPathThroughLowTrustlevel.secarc
View file @
93f7a142
...
...
@@ -28,8 +28,9 @@ component UnencryptedPathThroughLowTrustlevel {
port
out
int
inputSub2
;
connect
inputSub2
->
targetHelp
.
inputTarget
;
}
connect
subEncryptedConnector
.
inputSub2
->
targetHelp
.
inputTarget
;
}
\ No newline at end of file
montiSecArcAnalysis/src/test/resources/secarc/analysis/filter/FilterComponent.secarc
View file @
93f7a142
...
...
@@ -23,8 +23,8 @@ component FilterComponent {
port
in
int
input
;
connect
encrypted
targetHelp
.
output
->
filterURL
.
input
;
}
connect
encrypted
targetHelp
.
output
->
filterURL
.
input
;
}
\ No newline at end of file
montiSecArcAnalysis/src/test/resources/secarc/analysis/filter/FilterPort.secarc
View file @
93f7a142
...
...
@@ -9,6 +9,10 @@ component FilterPort {
component
Help
help
{
trustlevel
+
1
;
port
out
int
output
;
}
component
TargetHelp
targetHelp
{
...
...
@@ -19,4 +23,6 @@ component FilterPort {
(
filter
sql
)
in
int
input
;
}
connect
encrypted
help
.
output
->
targetHelp
.
input
;
}
\ No newline at end of file
montiSecArcAnalysis/src/test/resources/secarc/analysis/filter/FilterWithLowerTrustlevel.secarc
View file @
93f7a142
...
...
@@ -20,9 +20,9 @@ component FilterWithLowerTrustlevel {
component
(
filter
url
)
FilterURL
filterURL
{
port
in
int
input
;
connect
encrypted
targetHelp
.
output
->
filterURL
.
input
;
}
connect
encrypted
targetHelp
.
output
->
filterURL
.
input
;
}
\ No newline at end of file
montiSecArcAnalysis/src/test/resources/secarc/analysis/identity/IdentityWithoutConnector.secarc
View file @
93f7a142
...
...
@@ -16,8 +16,6 @@ component IdentityWithoutConnector {
component
TargetHelp
targetHelp
{
port
in
int
inputTarget
;
trustlevel
+
1
;
}
...
...
@@ -28,8 +26,6 @@ component IdentityWithoutConnector {
access
user
;
port
in
int
inputSub
;
}
}
\ No newline at end of file
montiSecArcAnalysis/src/test/resources/secarc/analysis/port/IncomingPort.secarc
View file @
93f7a142
...
...
@@ -9,9 +9,14 @@ component IncomingPort {
port
in
int
input
;
connect
input
->
help
.
phelp
;
component
Help
help
{
trustlevel
+
1
;
port
in
int
phelp
;
}
component
TargetHelp
targetHelp
{
...
...
montiSecArcAnalysis/src/test/resources/secarc/analysis/port/OutgoingPort.secarc
View file @
93f7a142
...
...
@@ -9,9 +9,13 @@ component OutgoingPort {
port
out
int
output
;
connect
help
.
phelp
->
output
;
component
Help
help
{
trustlevel
+
1
;
port
out
int
phelp
;
}
...
...
montiSecArcAnalysis/src/test/resources/secarc/analysis/role/DerivedThirdPartyRoles.secarc
View file @
93f7a142
...
...
@@ -9,9 +9,14 @@ component DerivedThirdPartyRoles {
identity
weak
help
->
targetHelp
;
identity
weak
targetHelp
->
targetHelp
.
targetHelpHelp
;
connect
encrypted
help
.
outputHelp
->
targetHelp
.
inputTarget
;
component
Help
help
{
trustlevel
+
1
;
port
out
int
outputHelp
;
}
component
TargetHelp
targetHelp
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment