100 Commits
Author SHA1 Message Date
Dirk Wetter 71571397e0 Merge branch '3.1dev' into mta-sts
... rebasing in order to kee u p with 3.1dev
2021-05-10 12:10:21 +02:00
Dirk Wetter 3fa9b16982 Just commit old work
... just comments and minor corrections in terminal output
2021-05-10 11:44:29 +02:00
Dirk WetterandGitHub 37a6b905a5 Merge pull request #1868 from dcooper16/improve_ossl30_support
Improve compatibility with OpenSSL 3.0
2021-04-08 15:00:28 +02:00
Dirk WetterandGitHub ac39aa5832 Merge pull request #1865 from drwetter/fix1860_svSE_etc_charset
Ensure certain regex patterns work as expected and aren't localized
2021-04-04 17:46:50 +02:00
Dirk 30bafe6d4f Ensure certain regex patterns work as expected and aren't localized
see #1860 .

This PR is trying to address an issue where probably newer bash versions
is treated differently as in other locales, W is just a variant of V
see also e.g.

https://collation-charts.org/opensolaris/opensolaris.2008.05.sv_SE.UTF-8.html
https://www.sqlservercentral.com/forums/topic/order-by-name-not-works#post-1644177
2021-04-04 11:55:29 +02:00
Dirk WetterandGitHub 1569bded44 Merge pull request #1864 from drwetter/rhs_quotes_fix
Fix redundant quotes at RHS of ==
2021-04-02 18:13:57 +02:00
Dirk 2101425c59 Fix redundant quotes at RHS of ==
While looking at #1860 there were two instances where
the right hand side of expressions in a double square
bracket had quotes.
2021-04-02 17:01:36 +02:00
Dirk WetterandGitHub 269f92dea1 Merge pull request #1863 from drwetter/fix_unittest_61_diff
Adjust master template for t/61_diff_testsslsh.t
2021-04-02 16:59:47 +02:00
Dirk e71ebfea4a Adjust master template for t/61_diff_testsslsh.t
... so that Travis CI works again
2021-04-02 16:57:20 +02:00
Dirk WetterandGitHub 88f9e07ac6 Merge pull request #1862 from vin01/3.1dev
Add xxd to docker image
2021-04-01 09:39:55 +02:00
Dirk WetterandGitHub f3e00738f3 Merge pull request #1861 from vin01/3.1dev
Use locally scoped counter in hex2binary
2021-03-31 15:43:19 +02:00
Dirk WetterandGitHub b468071d72 Merge pull request #1859 from jschauma/3.1dev
whitespace alignment
2021-03-25 22:13:31 +01:00
Dirk WetterandGitHub d07b6bcd2b Merge pull request #1857 from jschauma/3.1dev
add codepoints for RFC7905, ChaCha20-Poly1305
2021-03-25 20:58:41 +01:00
Dirk WetterandGitHub 2a6eb51e1d Merge pull request #1853 from dcooper16/cleanup_hex2binary
Cleanup conversion from ASCII-HEX to binary
2021-03-24 13:51:45 +01:00
Dirk WetterandGitHub 016ab0673a Merge pull request #1856 from caillou/patch-1
Fix typo
2021-03-21 13:24:29 +01:00
Dirk WetterandGitHub 895a6b975d Merge pull request #1851 from mbogh/patch-1
Added GitHub Action to External/related projects
2021-03-11 10:42:52 +01:00
Dirk WetterandGitHub 9f0e4763d3 Merge pull request #1849 from johannesschaefer/patch-1
Add web net tools to web frontend
2021-03-03 12:16:47 +01:00
Dirk WetterandGitHub 8b5bcd4769 Merge pull request #1847 from elfranne/patch-1
IANA <-> Openssl mapping issue
2021-02-25 13:46:15 +01:00
Dirk WetterandGitHub e9f73ffffd Merge pull request #1714 from dcooper16/clientauth
Print information about certificate-based client authentication
2021-02-08 09:22:31 +01:00
Dirk WetterandGitHub bf24c80174 Merge pull request #1837 from dcooper16/files_in_mass_testing_file
Mass testing with CSV, HTML, JSON, and/or LOG file names in mass test…
2021-02-04 21:00:12 +01:00
Dirk WetterandGitHub 53fc1c2a18 Merge pull request #1838 from fogs/3.1dev
Fixed typos
2021-01-30 10:46:17 +01:00
Dirk Wetter c832e8b12a Screen output correction (quotes), logic error when MTA-STS record was missing fixed 2021-01-26 14:24:31 +01:00
Dirk WetterandGitHub 1beac9c293 Update feature_request.md 2021-01-25 11:33:03 +01:00
Dirk WetterandGitHub 4704a883fe Update other-issues---question.md 2021-01-25 11:32:34 +01:00
Dirk WetterandGitHub 6ed29f628f Update feature_request.md 2021-01-25 11:31:47 +01:00
Dirk WetterandGitHub 226871625e Update feature_request.md 2021-01-25 11:31:31 +01:00
Dirk Wetter eee6e77201 https instead of http, also in the comment 2021-01-23 14:24:11 +01:00
Dirk WetterandGitHub 124f6f54be Update feature_request.md 2021-01-22 12:21:01 +01:00
Dirk WetterandGitHub 977f6966e1 Update bug_report.md 2021-01-22 12:20:05 +01:00
Dirk Wetter d3e592579e Better output formating for MTA-STS
* failreason_mtasts_rec additions is now adding not to the first array index only
* arrays for formatting error has now separators (but also at the last index)
  hint from https://web.archive.org/web/20101114051536/http://codesnippets.joyent.com/posts/show/1826
* replaced a couple of quoted double quotes by single quotes
* replaced a couple of quoted single quotes by single quotes

Unrelated to mta-sts:
* HAS_DIG_NOIDNOUT was moved to places where we need dig
* echo "$mx" --> safe_echo "$mx"

The latter two should be backported to 3.0
2021-01-21 22:46:46 +01:00
Dirk WetterandGitHub eabc21b7c4 Merge pull request #1830 from drwetter/fix_heartbleed_json.1828
Fix file output formatting for heartbleed
2021-01-20 10:12:44 +01:00
Dirk 770e066548 Fix file output formatting for heartbleed
Quotes were wrong for different results, which lead to some confusion
for finding, cve and cwe
2021-01-20 08:48:55 +01:00
Dirk WetterandGitHub 7bc16ff7e7 Merge pull request #1826 from drwetter/fix_travis
Travis CI didn't run. Trying to fix it (3.1dev)
2021-01-18 14:23:06 +01:00
Dirk c66d58b135 Filter for changing certificates of testssl.sh's server 2021-01-18 09:30:31 +01:00
Dirk Wetter 911ac8380f Several minor updates to MTA-STA
* stripping quotes moved to get_txt_record()
* fixing concatenation of errors: strings though need proper formatting
* new count_char_occurence() function as a general helper func
* better parsing of blanks in pattern (removed also where rfc states it's not
  allowed)
2021-01-17 21:54:12 +01:00
Dirk Wetter aa3b12a543 Save work, MTA-STS
* Imporved handling of quotes in TXT records. Previously we just
  stripped all quotes. Now get_txt_record includes ALL of them.
  sub_mta_sts() then removed the first and last double quote.
  (this need to be adjusted)

- get_txt_record() has been tested better for every binary so
  that it should return always the correct string
2021-01-17 11:02:47 +01:00
Dirk Wetter 429a8cf643 Fixed two more errors for MTA-STS and domain identification
* for sub.domain.tld $domain was empty
* typo for checking empty variable mta_sts_record led
  to a missing query for some type of domains
2021-01-14 14:30:13 +01:00
Dirk 9c9207ae89 Travis CI didn't run. Trying to fix it (3.1dev) 2021-01-13 23:15:42 +01:00
Dirk Wetter 4f1da9b192 Trying to address some of the domain issues for MTA-STS
There are checks now whether testssl.sh was started with --max and
whether we aim at a target which is an MX record. It has not been
thoutoughly tested but works for a couple of scenarios. There were
cases being identififed where this fails, see comments in the code.

Also this commit addresses an error in the URL handling: for
DNS queries a trailing dot is fine in the variable $NODE. For
HTTP queries it is not.
2021-01-13 11:23:36 +01:00
Dirk Wetter d96cfddf9b Add better mta_sts_record / mts-sts policy validation
Fix temp diretoty for debugging
2021-01-12 17:44:12 +01:00
Dirk WetterandGitHub 477bd13899 Merge pull request #1817 from drwetter/le_issuer_fix1816
Fix issuer check for Let's Encrypt
2021-01-07 10:25:02 +01:00
Dirk e65233877b Fix issuer check for Let's Encrypt which not halved the exp warn time
Addresses #1816. Also the name changed
2021-01-07 09:19:56 +01:00
Dirk Wetter 43b05b082c Added fileout, raw good/bad/info checks 2021-01-06 14:12:12 +01:00
Dirk Wetter b7cd397c98 Add MTA-STS as a PoC
This commit adds a first PoC implementation of MTA-STS (RFC 8461), see also
issue #1646.

What works:
- test a hostname which is equal to a MX record and a domainname and has
  a MTS-STS setup (dev.testssl.sh)
- check _mta-sts TXT record + https://mta-sts.$NODE/.well-known/mta-sts.txt
- check also _smtp._tls TXT record
- screen output

What doesn't work
- test a hostname which is not equal to domainname
- test a hostname which has not mx record
- fileout put
- any parsing of TXT record + .well-known/mta-sts.txt
- when no TXT records or .well-known/mta-sts.txt are there
- fileoutput
- colored screen output

There's a stub function for DANE.

There are also two stub functions splitting HTTP body from HTTP header
which I couldn't get to work and will be removed later.

Besides to avoid confusion it changes from all GET requests over HTTPS tm_out
to safe_echo. It's actually exactly the same only the name is different.
2021-01-05 22:05:54 +01:00
Dirk WetterandGitHub b8b23b94df Merge pull request #1813 from drwetter/file_exec_fix
Fixes the search for a non-executable socat binary
2021-01-05 15:27:40 +01:00
Dirk Wetter 5439985dbe Fixes the search for a non-executable socat binary
... otherwise there wwould be an ugly screen output.
This commit squashes the error message on the screen.
2021-01-05 15:25:28 +01:00
Dirk WetterandGitHub a9f4bb5fb5 Merge pull request #1810 from drwetter/starttls_injection
STARTTLS injection
2020-12-29 14:40:58 +01:00
Dirk WetterandGitHub e1a43e6e16 Merge branch '3.1dev' into starttls_injection 2020-12-29 13:46:18 +01:00
Dirk Wetter 7c66535628 resolve merge conflict 2020-12-29 13:44:04 +01:00
Dirk WetterandGitHub ffe223f6e6 Merge pull request #1807 from tosticated/custom_http_headers
Custom HTTP request headers support added. Addresses #1770
2020-12-26 12:13:59 +01:00
Dirk WetterandGitHub 2682d032b8 Merge pull request #1801 from drwetter/tmpfix_order_idsfriendly+U
Fix order for -U and --ids-friendly
2020-12-12 12:03:22 +01:00
Dirk Wetter 39132fe3d0 Fix order for -U and --ids-friendly
Workaround for bug see #1717. In addition: Bring  the test closer to a cleaner style,
as the others

Should --ids-firednly could be as well be removed when travis runs faster.
2020-12-11 20:49:15 +01:00
Dirk WetterandGitHub 4f375de26c Merge pull request #1799 from PeterDaveHello/RefactorDockerfileApkUsage
Refactor `apk` usage in Dockerfile
2020-12-09 09:17:00 +01:00
Dirk WetterandGitHub 2cb96d4e9e Merge pull request #1798 from drwetter/client_always_wide
Client simulation per default as wide
2020-12-08 23:23:55 +01:00
Dirk Wetter d76829cd28 wide mode for client simulation 2020-12-08 19:52:42 +01:00
Dirk Wetter e7fa4ff4ce Client simulation per default as wide
... in order to be consistent with run_server_preference().

The wide formatting of other tests need some inspection and
off the top off my head are not as perfectly formatted so that
they should not run per default in wide mode.
2020-12-08 19:43:07 +01:00
Dirk WetterandGitHub f6e2a5c381 Merge pull request #1797 from atroost/hex2curves
Hex2curves
2020-12-03 12:44:21 +01:00
Dirk WetterandGitHub ea6d99fe93 Merge pull request #1795 from drwetter/no_code_update
Trying to save resources for poor Travis/CI ;-)
2020-11-28 10:08:53 +01:00
Dirk WetterandGitHub a780ad6174 fix '|" 2020-11-27 20:24:46 +01:00
Dirk Wetter 1cd5510955 Trying to save resources for poor Travis/CI ;-)
See https://github.com/google/EarlGrey/pull/383/files/3b38a5dea36a88aba42a42931e77a7c5429a1837
2020-11-27 18:10:43 +01:00
Dirk WetterandGitHub 19494a6d8b Merge pull request #1794 from drwetter/drwetter-patch-1
Minor changes to Readme Dockerfile again
2020-11-27 17:05:22 +01:00
Dirk WetterandGitHub c88d22a0f0 Update Dockerfile.md 2020-11-27 17:05:03 +01:00
Dirk WetterandGitHub 2655e91255 Update Readme.md 2020-11-27 17:00:34 +01:00
Dirk WetterandGitHub 20c57289d1 Merge pull request #1792 from drwetter/docker_docu_polish
Consolidate docker sections in Readme.md and Dockerfile.md
2020-11-27 16:35:03 +01:00
Dirk Wetter 1a7e4f1e92 consolidate docker sections in Readme.md and Dockerfile.md
see #1791
2020-11-27 16:33:23 +01:00
Dirk WetterandGitHub 849c031597 Merge pull request #1789 from drwetter/skip_sometunittests
Trying to reduced the runtime of travis
2020-11-27 15:24:06 +01:00
Dirk Wetter 96d4b4f08b Trying to reduced the runtime of travis
Often in the past travis was hitting a limit (50min?).

This is a try to make reasonable cuts to the unit tests:
- For STARTTLS some checks with OPenSSL are skipped
- For JSON and HTML outputs --ids-friendly was added assumming we
  don't change the output of ticketbleed, CCSI, HeartBleed and ROBOT any more.
- There's also not point to run those checks against badssl
- for  the diff check we switch to 'or diag' to display a dfifference
2020-11-27 13:19:52 +01:00
Dirk WetterandGitHub a5d93486ad Merge pull request #1788 from drwetter/diff_unittest
Diff unittest
2020-11-26 20:04:22 +01:00
Dirk 665209bf60 typos 2020-11-26 16:27:40 +01:00
Dirk 1b63760bc3 Add baseline master file for testssl.sh 2020-11-26 16:05:08 +01:00
Dirk WetterandGitHub 9aafc452d8 Merge pull request #1787 from drwetter/unittest_reorder
Unittest reorder
2020-11-26 16:04:02 +01:00
Dirk a98ede0720 Finalize first diff check for travis 2020-11-26 15:58:13 +01:00
Dirk 49d321cfbb Add "command not found" 2020-11-26 13:41:44 +01:00
Dirk 191efddaee document changes from previous commits 2020-11-26 13:07:49 +01:00
Dirk 0c20b21fc2 Better order, "command not found added" 2020-11-26 13:02:10 +01:00
Dirk Wetter 9ea7446203 Add STARTTLS injection to Changelog 2020-11-26 10:48:32 +01:00
Dirk Wetter 5c5c4dcd58 Merge branch '3.1dev' into starttls_smtp_injection
Resolving conflicts because of do_winshock
2020-11-26 10:45:02 +01:00
Dirk WetterandGitHub cc40d2f559 Merge pull request #1786 from drwetter/new-templates
Update issue templates
2020-11-25 21:19:48 +01:00
Dirk WetterandGitHub b47bc9e871 Update bug_report.md 2020-11-25 21:19:26 +01:00
Dirk WetterandGitHub cab2ee7706 Update bug_report.md 2020-11-25 21:13:44 +01:00
Dirk WetterandGitHub 0ed7ede6de Update other-issues---question.md 2020-11-25 21:12:47 +01:00
Dirk 9ee939397e Merge remote-tracking branch 'origin/template_update' into new-templates 2020-11-25 21:11:18 +01:00
Dirk WetterandGitHub d1481616db Update issue templates
Use the new style suggested bu github
2020-11-25 21:07:54 +01:00
Dirk Wetter 4a62b365a9 remove old universal template 2020-11-25 20:12:00 +01:00
Dirk WetterandGitHub 21d0910b50 Merge pull request #1781 from drwetter/fix_1779_3.1dev
Fix reading SSLv2 socket
2020-11-24 21:58:05 +01:00
Dirk 3a15383273 Fix reading SSLv2 socket
This fixes #1779. There was a problem introduced in
3cd1273439 which counted
the size of the file name rather than the size of the
socket reply.

The helper function count_chars() is now not used anymore.
It maybe useful in the future though.
2020-11-20 11:23:20 +01:00
Dirk WetterandGitHub ac99fbe078 Merge pull request #1773 from drwetter/ca-update
Update certificate stores
2020-11-14 11:11:10 +01:00
Dirk WetterandGitHub 2c4799e154 Merge pull request #1518 from dcooper16/html_colors
Make colors in HTML output more accessible
2020-11-14 11:10:47 +01:00
Dirk Wetter ce802634b6 Update remaining: Apple / Java / Microsoft
* also ca_hashes.txt

* Used Java SDK 15 instead of JRE 8
* Used Windows 20H2
* Java Keystore has added 5 certificates (90 --> 95)

Updated Readme and make it more reproducible
2020-11-13 22:01:17 +01:00
Dirk WetterandGitHub a019b3d396 --overwrite / X-XSS-Protection 2020-11-13 19:26:47 +01:00
Dirk WetterandGitHub 2098ea33c5 Merge pull request #1777 from drwetter/feature_overwrite
Introducing --overwrite option
2020-11-13 18:59:03 +01:00
Dirk Wetter 9d0744e229 Introducing --overwrite option
Sometimes it is needed to overwrite existing output files.
This has been requested in the past (#927). For safety reasons
it was not implemented.

However I realized that it could be useful. It requires some
responsible usage though.

Code added, help() and manpages added -- warnings added too.
2020-11-13 16:05:53 +01:00
Dirk Wetter 33ea2c710c updated Linux.pem + Mozilla.pem 2020-11-11 18:15:56 +01:00
Dirk WetterandGitHub 65586311f6 Merge pull request #1769 from drwetter/fix_1768
Fix perl style variable in starttls_full_read()
2020-11-05 14:07:42 +01:00
Dirk Wetter 19219dca2e Fix perl style variable in starttls_full_read()
This fixes #1768
2020-11-05 11:47:53 +01:00
Dirk WetterandGitHub b0c1f99923 Merge pull request #1766 from keisentraut/fix-gitignore-ignore-html-scan-results
.gitignore: ignore HTML scan results like example.com_p443-20201103-1…
2020-11-03 20:35:46 +01:00
Dirk WetterandGitHub 498dc80885 Merge pull request #1765 from drwetter/http_header_color
Remove lite cyan color for http header
2020-11-03 08:51:35 +01:00
Dirk 12bf2987a2 Remove lite cyan color for http header
While we are not sure yet how we deal with "other" colors and different
backgrounds users can have, I'll remove the light cyan here until we
settle on a standard. (other=not yellow,reds,brown,greens)
2020-11-03 08:44:40 +01:00
Dirk WetterandGitHub 8d812f5dc0 Merge pull request #1764 from keisentraut/fix-1762
fix #1762: Stop labeling X-XSS-Protection as green
2020-11-02 21:46:51 +01:00
Dirk WetterandGitHub e3cd36a63b Merge pull request #1760 from keisentraut/fix-1757
fix #1757: manpage: --c has one dash to much
2020-10-29 20:27:19 +01:00