Skip to content

Commit 74ac19a

Browse files
ic0nsic0ns
authored
Merge pull request #54 from RUB-NDS/NoColorRework
No color rework
2 parents f81aeaf + f498acb commit 74ac19a

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
1414
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
1515
import de.rub.nds.tlsscanner.config.ScannerConfig;
16+
import de.rub.nds.tlsscanner.constants.AnsiColors;
1617
import de.rub.nds.tlsscanner.constants.AnsiEscapeSequence;
1718
import de.rub.nds.tlsscanner.report.SiteReport;
1819
import java.io.IOException;
@@ -47,11 +48,11 @@ public static void main(String[] args) throws IOException {
4748
LOGGER.info("Performing Scan, this may take some time...");
4849
SiteReport report = scanner.scan();
4950
LOGGER.info("Scanned in:" + ((System.currentTimeMillis() - time) / 1000) + "s\n");
50-
if (!config.getGeneralDelegate().isDebug()) {
51+
if (!config.getGeneralDelegate().isDebug() && !config.isNoProgressbar()) {
5152
// ANSI escape sequences to erase the progressbar
5253
ConsoleLogger.CONSOLE.info(AnsiEscapeSequence.ANSI_ONE_LINE_UP + AnsiEscapeSequence.ANSI_ERASE_LINE);
5354
}
54-
ConsoleLogger.CONSOLE.info("Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n" + report.getFullReport(config.getReportDetail()));
55+
ConsoleLogger.CONSOLE.info(AnsiColors.ANSI_RESET + "Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n" + report.getFullReport(config.getReportDetail()));
5556
} catch (ConfigurationException E) {
5657
LOGGER.error("Encountered a ConfigurationException aborting.", E);
5758
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ public void setSupportsStaticEcdh(Boolean supportsStaticEcdh) {
12881288
this.supportsStaticEcdh = supportsStaticEcdh;
12891289
}
12901290

1291-
public boolean isNoColour() {
1291+
public boolean isNoColor() {
12921292
return noColor;
12931293
}
12941294

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -685,83 +685,83 @@ private StringBuilder prettyAppend(StringBuilder builder, String name, Boolean v
685685
}
686686

687687
private StringBuilder prettyAppendGreenOnSuccess(StringBuilder builder, String name, Boolean value) {
688-
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");
688+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET: value) : value)).append("\n");
689689
}
690690

691691
private StringBuilder prettyAppendGreenOnFailure(StringBuilder builder, String name, Boolean value) {
692-
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");
692+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : (report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value))).append("\n");
693693
}
694694

695695
private StringBuilder prettyAppendRedOnSuccess(StringBuilder builder, String name, Boolean value) {
696-
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");
696+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value) : value)).append("\n");
697697
}
698698

699699
private StringBuilder prettyAppendRedOnFailure(StringBuilder builder, String name, Boolean value) {
700-
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");
700+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : (report.isNoColor() == false ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value))).append("\n");
701701
}
702702

703703
private StringBuilder prettyAppendYellowOnFailure(StringBuilder builder, String name, Boolean value) {
704-
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");
704+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? value : (report.isNoColor() == false ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value))).append("\n");
705705
}
706706

707707
private StringBuilder prettyAppendYellowOnSuccess(StringBuilder builder, String name, Boolean value) {
708-
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");
708+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value) : value)).append("\n");
709709
}
710710

711711
private StringBuilder prettyAppendGreenRed(StringBuilder builder, String name, Boolean value) {
712-
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");
712+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value) : (report.isNoColor() == false ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value))).append("\n");
713713
}
714714

715715
private StringBuilder prettyAppendRedGreen(StringBuilder builder, String name, Boolean value) {
716-
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");
716+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value) : (report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value))).append("\n");
717717
}
718718

719719
private StringBuilder prettyAppendGreenYellow(StringBuilder builder, String name, Boolean value) {
720-
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_YELLOW : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
720+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value) : (report.isNoColor() == false ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value))).append("\n");
721721
}
722722

723723
private StringBuilder prettyAppendYellowGreen(StringBuilder builder, String name, Boolean value) {
724-
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 : (report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET)).append("\n");
724+
return builder.append(addIndentations(name)).append(": ").append(value == null ? "Unknown" : (value == Boolean.TRUE ? (report.isNoColor() == false ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value) : (report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value))).append("\n");
725725
}
726726

727727
private StringBuilder prettyAppendYellow(StringBuilder builder, String value) {
728-
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_YELLOW : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
728+
return builder.append((report.isNoColor() == false ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value)).append("\n");
729729
}
730730

731731
private StringBuilder prettyAppendRed(StringBuilder builder, String value) {
732-
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
732+
return builder.append((report.isNoColor() == false ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value)).append("\n");
733733
}
734734

735735
private StringBuilder prettyAppendRed(StringBuilder builder, String name, String value) {
736-
return builder.append(addIndentations(name)).append(": ").append((report.isNoColour() == false ? AnsiColors.ANSI_RED : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
736+
return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_RED + value + AnsiColors.ANSI_RESET : value)).append("\n");
737737
}
738738

739739
private StringBuilder prettyAppendGreen(StringBuilder builder, String value) {
740-
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
740+
return builder.append((report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value)).append("\n");
741741
}
742742

743743
private StringBuilder prettyAppendGreen(StringBuilder builder, String name, String value) {
744-
return builder.append(addIndentations(name)).append(": ").append((report.isNoColour() == false ? AnsiColors.ANSI_GREEN : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
744+
return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_GREEN + value + AnsiColors.ANSI_RESET : value)).append("\n");
745745
}
746746

747747
private StringBuilder prettyAppendYellow(StringBuilder builder, String name, String value) {
748-
return builder.append(addIndentations(name)).append(": ").append((report.isNoColour() == false ? AnsiColors.ANSI_YELLOW : AnsiColors.ANSI_RESET) + value + AnsiColors.ANSI_RESET).append("\n");
748+
return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_YELLOW + value + AnsiColors.ANSI_RESET : value)).append("\n");
749749
}
750750

751751
private StringBuilder prettyAppendHeading(StringBuilder builder, String value) {
752-
return builder.append((report.isNoColour() == false ? AnsiColors.ANSI_BOLD + AnsiColors.ANSI_BLUE : AnsiColors.ANSI_RESET) + "\n--------------------------------------------------------\n" + value + "\n\n" + AnsiColors.ANSI_RESET);
752+
return builder.append((report.isNoColor() == false ? AnsiColors.ANSI_BOLD + AnsiColors.ANSI_BLUE + "\n--------------------------------------------------------\n" + value + "\n\n" + AnsiColors.ANSI_RESET : "\n--------------------------------------------------------\n" + value + "\n\n"));
753753
}
754754

755755
private StringBuilder prettyAppendUnderlined(StringBuilder builder, String name, String value) {
756-
return builder.append(addIndentations(name)).append(": ").append(AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET).append("\n");
756+
return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET : value)).append("\n");
757757
}
758758

759759
private StringBuilder prettyAppendUnderlined(StringBuilder builder, String name, boolean value) {
760-
return builder.append(addIndentations(name)).append(": ").append(AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET).append("\n");
760+
return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET : value)).append("\n");
761761
}
762762

763763
private StringBuilder prettyAppendUnderlined(StringBuilder builder, String name, long value) {
764-
return builder.append(addIndentations(name)).append(": ").append(AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET).append("\n");
764+
return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET : value)).append("\n");
765765
}
766766

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

0 commit comments

Comments
 (0)