Skip to content

Commit 8fe28fc

Browse files
Apply spotless, code cleaning
1 parent 249c22f commit 8fe28fc

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

src/main/java/it/unipr/checker/TimestampDependencyChecker.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package it.unipr.checker;
22

3-
import java.util.HashSet;
4-
import java.util.Set;
5-
6-
import org.apache.logging.log4j.LogManager;
7-
import org.apache.logging.log4j.Logger;
8-
93
import it.unipr.analysis.MyCache;
104
import it.unipr.analysis.taint.TaintAbstractDomain;
115
import it.unipr.analysis.taint.TaintElement;
@@ -26,25 +20,29 @@
2620
import it.unive.lisa.checks.semantic.SemanticCheck;
2721
import it.unive.lisa.program.cfg.CFG;
2822
import it.unive.lisa.program.cfg.statement.Statement;
23+
import java.util.HashSet;
24+
import java.util.Set;
25+
import org.apache.logging.log4j.LogManager;
26+
import org.apache.logging.log4j.Logger;
2927

3028
public class TimestampDependencyChecker implements
31-
SemanticCheck<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> {
29+
SemanticCheck<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> {
3230

3331
private static final Logger log = LogManager.getLogger(ReentrancyChecker.class);
3432

35-
3633
private final Set<Statement> sinks = new HashSet<>();
3734

3835
@Override
3936
public void beforeExecution(
40-
CheckToolWithAnalysisResults<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool) {
37+
CheckToolWithAnalysisResults<
38+
SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool) {
4139

4240
}
4341

4442
@Override
4543
public boolean visit(
4644
CheckToolWithAnalysisResults<
47-
SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool,
45+
SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool,
4846
CFG graph, Statement node) {
4947

5048
EVMCFG cfg = ((EVMCFG) graph);
@@ -57,12 +55,11 @@ public boolean visit(
5755
this.sinks.addAll(cfg.getAllJumpI());
5856
}
5957

60-
6158
if (sinks.contains(node))
6259
for (AnalyzedCFG<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain,
6360
TypeEnvironment<InferredTypes>>> result : tool.getResultOf(cfg)) {
6461
AnalysisState<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain,
65-
TypeEnvironment<InferredTypes>>> analysisResult = null;
62+
TypeEnvironment<InferredTypes>>> analysisResult = null;
6663

6764
try {
6865
analysisResult = result.getAnalysisStateBefore(node);
@@ -82,7 +79,7 @@ public boolean visit(
8279
if (node instanceof Sha3 || node instanceof Sstore || node instanceof Jumpi) {
8380
if (checkTaintTwoPops(taintedStack))
8481
raiseWarning(node, tool, cfg);
85-
} else if (node instanceof Jump) {
82+
} else if (node instanceof Jump) {
8683
if (checkTaintOnePop(taintedStack))
8784
raiseWarning(node, tool, cfg);
8885
}
@@ -104,7 +101,6 @@ else if (firstStackElement.isTaint() || secondStackElement.isTaint())
104101
return false;
105102
}
106103

107-
108104
// 1 pop()
109105
private boolean checkTaintOnePop(TaintAbstractDomain taintedStack) {
110106
TaintElement firstStackElement = taintedStack.getFirstElement();
@@ -116,7 +112,6 @@ else if (firstStackElement.isTaint())
116112
return false;
117113
}
118114

119-
120115
private void raiseWarning(Statement sink, CheckToolWithAnalysisResults<
121116
SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool,
122117
EVMCFG cfg) {

src/main/java/it/unipr/checker/TxOriginChecker.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package it.unipr.checker;
22

3-
import org.apache.logging.log4j.LogManager;
4-
import org.apache.logging.log4j.Logger;
5-
63
import it.unipr.analysis.MyCache;
74
import it.unipr.analysis.taint.TaintAbstractDomain;
85
import it.unipr.analysis.taint.TaintElement;
@@ -20,16 +17,18 @@
2017
import it.unive.lisa.checks.semantic.SemanticCheck;
2118
import it.unive.lisa.program.cfg.CFG;
2219
import it.unive.lisa.program.cfg.statement.Statement;
20+
import org.apache.logging.log4j.LogManager;
21+
import org.apache.logging.log4j.Logger;
2322

2423
public class TxOriginChecker implements
25-
SemanticCheck<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> {
24+
SemanticCheck<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> {
2625

2726
private static final Logger log = LogManager.getLogger(TxOriginChecker.class);
2827

2928
@Override
3029
public boolean visit(
3130
CheckToolWithAnalysisResults<
32-
SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool,
31+
SimpleAbstractState<MonolithicHeap, TaintAbstractDomain, TypeEnvironment<InferredTypes>>> tool,
3332
CFG graph, Statement node) {
3433

3534
if (node instanceof Jumpi) {
@@ -38,7 +37,7 @@ public boolean visit(
3837
for (AnalyzedCFG<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain,
3938
TypeEnvironment<InferredTypes>>> result : tool.getResultOf(cfg)) {
4039
AnalysisState<SimpleAbstractState<MonolithicHeap, TaintAbstractDomain,
41-
TypeEnvironment<InferredTypes>>> analysisResult = null;
40+
TypeEnvironment<InferredTypes>>> analysisResult = null;
4241

4342
try {
4443
analysisResult = result.getAnalysisStateBefore(node);
@@ -69,9 +68,10 @@ public boolean visit(
6968
log.debug("Tx. Origin attack at {} at line no. {}", jumploc.getPc(),
7069
jumploc.getSourceCodeLine());
7170

72-
String warn = "TxOrigin attack at " + ((ProgramCounterLocation) node.getLocation()).getSourceCodeLine();
71+
String warn = "TxOrigin attack at "
72+
+ ((ProgramCounterLocation) node.getLocation()).getSourceCodeLine();
7373
tool.warn(warn);
74-
MyCache.getInstance().addTxOriginWarning(cfg.hashCode(), warn);
74+
MyCache.getInstance().addTxOriginWarning(cfg.hashCode(), warn);
7575
}
7676
}
7777
}

0 commit comments

Comments
 (0)