Skip to content

Commit b6b9227

Browse files
ic0nsic0ns
authored
Merge pull request #34 from RUB-NDS/NoColorFlag
No color flag
2 parents 9c126ae + 873c17b commit b6b9227

File tree

5 files changed

+30
-21
lines changed

5 files changed

+30
-21
lines changed

‎src/main/java/de/rub/nds/tlsscanner/ScanJobExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public SiteReport execute(ScannerConfig config, ScanJob scanJob) {
6161

6262
ClientDelegate clientDelegate = (ClientDelegate) config.getDelegate(ClientDelegate.class);
6363
String hostname = clientDelegate.getHost();
64-
SiteReport report = new SiteReport(hostname, probeTypes);
64+
SiteReport report = new SiteReport(hostname, probeTypes, config.isNoColor());
6565
report.setServerIsAlive(Boolean.TRUE);
6666
for (ProbeResult result : resultList) {
6767
result.merge(report);

‎src/main/java/de/rub/nds/tlsscanner/TlsScanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public SiteReport scan() {
106106
return executor.execute(config, job);
107107
}
108108
// testList.add(new SignatureAndHashAlgorithmProbe(websiteHost));
109-
SiteReport report = new SiteReport(config.getClientDelegate().getHost(), new LinkedList<ProbeType>());
109+
SiteReport report = new SiteReport(config.getClientDelegate().getHost(), new LinkedList<ProbeType>(), config.isNoColor());
110110
report.setServerIsAlive(false);
111111
return report;
112112
}

‎src/main/java/de/rub/nds/tlsscanner/config/ScannerConfig.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public class ScannerConfig extends TLSDelegateConfig {
3232

3333
@Parameter(names = "-danger", required = false, description = "Integer value (1 - 10) which specifies how aggressive the Scanner should test. Default 10")
3434
private int dangerLevel = 10;
35+
36+
@Parameter(names = "-noColor", required = false, description = "If you use Windows or don't want colored text.")
37+
private Boolean noColor = false;
3538

3639
@ParametersDelegate
3740
private GeneralDelegate generalDelegate;
@@ -83,6 +86,11 @@ public boolean isImplementation() {
8386
public void setImplementation(boolean implementation) {
8487
this.implementation = implementation;
8588
}
89+
90+
public Boolean isNoColor() {
91+
return noColor;
92+
}
93+
8694

8795
@Override
8896
public Config createConfig() {

‎src/main/java/de/rub/nds/tlsscanner/report/SiteReport.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import de.rub.nds.tlsattacker.core.constants.SignatureAndHashAlgorithm;
1919
import de.rub.nds.tlsattacker.core.constants.TokenBindingKeyParameters;
2020
import de.rub.nds.tlsattacker.core.constants.TokenBindingVersion;
21-
import de.rub.nds.tlsscanner.constants.AnsiColors;
22-
import de.rub.nds.tlsscanner.constants.CipherSuiteGrade;
2321
import de.rub.nds.tlsscanner.constants.GcmPattern;
2422
import de.rub.nds.tlsscanner.constants.ProbeType;
2523
import de.rub.nds.tlsscanner.probe.certificate.CertificateReport;
@@ -176,9 +174,13 @@ public class SiteReport {
176174
private GcmPattern gcmPattern = null;
177175
private Boolean gcmCheck = null;
178176

179-
public SiteReport(String host, List<ProbeType> probeTypeList) {
177+
//NoColor Flag
178+
private boolean noColor = false;
179+
180+
public SiteReport(String host, List<ProbeType> probeTypeList, boolean noColor) {
180181
this.host = host;
181182
this.probeTypeList = probeTypeList;
183+
this.noColor = noColor;
182184
}
183185

184186
public String getHost() {
@@ -1109,6 +1111,9 @@ public void setSupportsStaticEcdh(Boolean supportsStaticEcdh) {
11091111
this.supportsStaticEcdh = supportsStaticEcdh;
11101112
}
11111113

1114+
public boolean isNoColour() {
1115+
return noColor;
1116+
}
11121117

11131118
public String getFullReport()
11141119
{

‎src/main/java/de/rub/nds/tlsscanner/report/SiteReportPrinter.java

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@
1313
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
1414
import de.rub.nds.tlsattacker.core.constants.CompressionMethod;
1515
import de.rub.nds.tlsattacker.core.constants.ExtensionType;
16-
import static de.rub.nds.tlsattacker.core.constants.HandshakeMessageType.UNKNOWN;
1716
import de.rub.nds.tlsattacker.core.constants.NamedGroup;
18-
import static de.rub.nds.tlsattacker.core.constants.NamedGroup.NONE;
1917
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
20-
import static de.rub.nds.tlsattacker.core.constants.ProtocolVersion.SSL2;
2118
import de.rub.nds.tlsattacker.core.constants.SignatureAndHashAlgorithm;
2219
import de.rub.nds.tlsattacker.core.constants.TokenBindingKeyParameters;
2320
import de.rub.nds.tlsattacker.core.constants.TokenBindingVersion;
24-
import static de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType.FULL;
2521
import de.rub.nds.tlsscanner.constants.AnsiColors;
2622
import de.rub.nds.tlsscanner.constants.CipherSuiteGrade;
2723
import de.rub.nds.tlsscanner.probe.certificate.CertificateReport;
@@ -348,51 +344,51 @@ private StringBuilder prettyAppend(StringBuilder builder, String name, Boolean v
348344
}
349345

350346
private StringBuilder prettyAppendGreenOnSuccess(StringBuilder builder, String name, Boolean value) {
351-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value)).append("\n");
347+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET : value)).append("\n");
352348
}
353349

354350
private StringBuilder prettyAppendGreenOnFailure(StringBuilder builder, String name, Boolean value) {
355-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET)).append("\n");
351+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : (report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
356352
}
357353

358354
private StringBuilder prettyAppendRedOnSuccess(StringBuilder builder, String name, Boolean value) {
359-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value)).append("\n");
355+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET : value)).append("\n");
360356
}
361357

362358
private StringBuilder prettyAppendRedOnFailure(StringBuilder builder, String name, Boolean value) {
363-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET)).append("\n");
359+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : (report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
364360
}
365361

366362
private StringBuilder prettyAppendYellowOnFailure(StringBuilder builder, String name, Boolean value) {
367-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET)).append("\n");
363+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : (report.isNoColour() == false ? AnsiColors.ANSI_YELLOW : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
368364
}
369365

370366
private StringBuilder prettyAppendYellowOnSuccess(StringBuilder builder, String name, Boolean value) {
371-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value)).append("\n");
367+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColour() == false ? AnsiColors.ANSI_YELLOW : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET : value)).append("\n");
372368
}
373369

374370
private StringBuilder prettyAppendGreenRed(StringBuilder builder, String name, Boolean value) {
375-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET)).append("\n");
371+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET : (report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
376372
}
377373

378374
private StringBuilder prettyAppendRedGreen(StringBuilder builder, String name, Boolean value) {
379-
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET)).append("\n");
375+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET : (report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
380376
}
381377

382378
private StringBuilder prettyAppendYellow(StringBuilder builder, String value) {
383-
return builder.append(AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET).append("\n");
379+
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_YELLOW : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
384380
}
385381

386382
private StringBuilder prettyAppendRed(StringBuilder builder, String value) {
387-
return builder.append(AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET).append("\n");
383+
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
388384
}
389385

390386
private StringBuilder prettyAppendGreen(StringBuilder builder, String value) {
391-
return builder.append(AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET).append("\n");
387+
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
392388
}
393389

394390
private StringBuilder prettyAppendHeading(StringBuilder builder, String value) {
395-
return builder.append(AnsiColors.ANSI_BOLD + AnsiColors.ANSI_BLUE + "\n--------------------------------------------------------\n" + value + "\n\n" + AnsiColors.ANSI_RESET);
391+
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_BOLD + AnsiColors.ANSI_BLUE : AnsiColors.ANSI_RESET) + "\n--------------------------------------------------------\n" + value + "\n\n" + AnsiColors.ANSI_RESET);
396392
}
397393

398394
private void prettyAppendDrown(StringBuilder builder, String testName, DrownVulnerabilityType drownVulnerable) {

0 commit comments

Comments
 (0)