Skip to content

Commit 52b0fb4

Browse files
manfred-kaisermanfred-kaiser
committed
Merge branch 'develop'
2 parents 076d4dd + 22aa80e commit 52b0fb4

26 files changed

+771
-171
lines changed

‎.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.6.0
2+
current_version = 0.6.1
33

44
[bumpversion:file:snapcraft.yaml]
55

‎AppImageBuilder.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ AppDir:
1717
id: at.ssh-mitm.server
1818
name: ssh-mitm
1919
icon: ssh-mitm
20-
version: 0.6.0
20+
version: 0.6.1
2121
# Set the python executable as entry point
2222
exec: usr/bin/python3
2323
# Set the application main script path as argument. Use '$@' to forward CLI parameters
@@ -70,4 +70,3 @@ AppImage:
7070
arch: x86_64
7171
file_name: ssh-mitm-x86_64.AppImage
7272
update-information: gh-releases-zsync|ssh-mitm|ssh-mitm|latest|ssh-mitm-x86_64.AppImage.zsync
73-
sign-key: None

‎CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.6.1] - 2021-09-21
11+
12+
### Fixed
13+
14+
- missing environment variable in snap file
15+
- fixed ssh-mitm-audit command
16+
1017
## [0.6.0] - 2021-09-13
1118

1219
### Added
@@ -203,7 +210,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
203210

204211
- fixed pseudo terminal on exec command
205212

206-
[Unreleased]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.0...develop
213+
[Unreleased]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.1...develop
214+
[0.6.1]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.0...0.6.1
207215
[0.6.0]: https://github.com/ssh-mitm/ssh-mitm/compare/0.5.13...0.6.0
208216
[0.5.13]: https://github.com/ssh-mitm/ssh-mitm/compare/0.5.12...0.5.13
209217
[0.5.12]: https://github.com/ssh-mitm/ssh-mitm/compare/0.5.11...0.5.12

‎doc/CVE-2016-20012.rst

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
CVE-2016-20012
2+
==============
3+
4+
.. raw:: html
5+
6+
<div class="card card-margin">
7+
<div class="card-header no-border">
8+
<h5 class="card-title cve-title">CVE-2016-20012</h5>
9+
</div>
10+
<div class="card-body pt-0">
11+
<div class="widget-49">
12+
<div class="widget-49-title-wrapper">
13+
<div class="widget-49-date-primary">
14+
<span class="widget-49-date-day">7.4</span>
15+
<span class="widget-49-date-month">CVSS</span>
16+
</div>
17+
<div class="widget-49-meeting-info">
18+
<span class="widget-49-pro-title"><b>Vector:</b> CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:N</span>
19+
<span class="widget-49-meeting-time">
20+
<a href="https://nvd.nist.gov/vuln/detail/CVE-2016-20012">https://nvd.nist.gov/vuln/detail/CVE-2016-20012</a>
21+
</span>
22+
</div>
23+
</div>
24+
<p class="widget-49-meeting-integration">
25+
<i class="fas fa-check"></i> integrated in <a href="https://github.com/ssh-mitm/ssh-mitm/blob/master/ssh_proxy_server/authentication.py">SSH-MITM server</a>
26+
</p>
27+
<p class="widget-49-meeting-text">
28+
OpenSSH through 8.7 allows remote attackers, who have a suspicion that
29+
a certain combination of username and public key is known to an SSH server,
30+
to test whether this suspicion is correct. This occurs because a challenge is
31+
sent only when that combination could be valid for a login session.
32+
</p>
33+
<span class="widget-49-pro-title"><b>Affected Software:</b></span>
34+
<ul class="widget-49-meeting-points">
35+
<li class="widget-49-meeting-item"><b>OpenSSH</b> &lt;=8.7</li>
36+
</ul>
37+
</div>
38+
</div>
39+
</div>
40+
41+
42+
References
43+
----------
44+
45+
* https://github.com/openssh/openssh-portable/blob/d0fffc88c8fe90c1815c6f4097bc8cbcabc0f3dd/auth2-pubkey.c#L261-L265
46+
* https://github.com/openssh/openssh-portable/pull/270
47+
* https://rushter.com/blog/public-ssh-keys/
48+
* https://utcc.utoronto.ca/~cks/space/blog/tech/SSHKeysAreInfoLeak

‎doc/CVE-2021-36367.rst

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
CVE-2021-36367
2+
==============
3+
4+
.. raw:: html
5+
6+
<div class="card card-margin">
7+
<div class="card-header no-border">
8+
<h5 class="card-title cve-title">CVE-2021-36367</h5>
9+
</div>
10+
<div class="card-body pt-0">
11+
<div class="widget-49">
12+
<div class="widget-49-title-wrapper">
13+
<div class="widget-49-date-primary">
14+
<span class="widget-49-date-day">8.1</span>
15+
<span class="widget-49-date-month">CVSS</span>
16+
</div>
17+
<div class="widget-49-meeting-info">
18+
<span class="widget-49-pro-title"><b>Vector:</b> CVSS:3.1/AV:N/AC:L/PR:N/UI:R/S:U/C:H/I:H/A:N</span>
19+
<span class="widget-49-meeting-time">
20+
<a href="https://nvd.nist.gov/vuln/detail/CVE-2021-36367">https://nvd.nist.gov/vuln/detail/CVE-2021-36367</a>
21+
</span>
22+
</div>
23+
</div>
24+
<p class="widget-49-meeting-integration">
25+
<i class="fas fa-check"></i> integrated in SSH-MITM server
26+
</p>
27+
<p class="widget-49-meeting-text">
28+
<b>Note: MITRE's description is wrong. Please read note bellow.</b></br>
29+
PuTTY through 0.75 proceeds with establishing an SSH session even if it has never sent a substantive authentication response.
30+
This makes it easier for an attacker-controlled SSH server to present a later spoofed authentication prompt
31+
(that the attacker can use to capture credential data, and use that data for purposes that are undesired by the client user).
32+
</p>
33+
<span class="widget-49-pro-title"><b>Affected Software:</b></span>
34+
<ul class="widget-49-meeting-points">
35+
<li class="widget-49-meeting-item"><b>PuTTY</b> &lt; 0.71</li>
36+
</ul>
37+
</div>
38+
</div>
39+
</div>
40+
41+
.. note::
42+
43+
**Comment from Simon Tatham:**
44+
45+
CVE-2021-36367 refers to this new option as a fix for a vulnerability, and describes the vulnerability
46+
as "PuTTY through 0.75 proceeds with establishing an SSH session even if it has never sent a substantive
47+
authentication response". With respect to the author of that text, we consider that to be misleading.
48+
It is perfectly legal for the server to waive authentication, and actually useful in some legitimate use cases;
49+
it is perfectly legal for PuTTY to proceed with the connection regardless; and the trust sigil system introduced
50+
in 0.71 already defends against every spoofing attack we know of that a server could attempt by doing this unexpectedly.
51+
This new option is a UI improvement, but not in and of itself a vital vulnerability fix.
52+
53+
54+
References
55+
----------
56+
57+
* https://git.tartarus.org/?p=simon/putty.git;a=commit;h=1dc5659aa62848f0aeb5de7bd3839fecc7debefa
58+
* https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html

‎doc/CVE-2021-36368.rst

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
CVE-2021-36368
2+
==============
3+
4+
.. raw:: html
5+
6+
<div class="card card-margin">
7+
<div class="card-header no-border">
8+
<h5 class="card-title cve-title">CVE-2021-36368</h5>
9+
</div>
10+
<div class="card-body pt-0">
11+
<div class="widget-49">
12+
<div class="widget-49-title-wrapper">
13+
<div class="widget-49-date-primary">
14+
<span class="widget-49-date-day">N/A</span>
15+
<span class="widget-49-date-month">CVSS</span>
16+
</div>
17+
<div class="widget-49-meeting-info">
18+
<span class="widget-49-pro-title"><b>Vector:</b> N/A</span>
19+
<span class="widget-49-meeting-time">
20+
<a href="https://nvd.nist.gov/vuln/detail/CVE-2021-36368">https://nvd.nist.gov/vuln/detail/CVE-2021-36368</a>
21+
</span>
22+
</div>
23+
</div>
24+
<p class="widget-49-meeting-integration">
25+
<i class="fas fa-check"></i> integrated in SSH-MITM server
26+
</p>
27+
<p class="widget-49-meeting-text">
28+
This CVE is marked as reserved.
29+
</p>
30+
<span class="widget-49-pro-title"><b>Affected Software:</b></span>
31+
<ul class="widget-49-meeting-points">
32+
<li class="widget-49-meeting-item"><b>OpenSSHH</b> &lt;= 8.7</li>
33+
</ul>
34+
</div>
35+
</div>
36+
</div>

‎doc/CVE-2021-36369.rst

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
CVE-2021-36369
2+
==============
3+
4+
.. raw:: html
5+
6+
<div class="card card-margin">
7+
<div class="card-header no-border">
8+
<h5 class="card-title cve-title">CVE-2021-36369</h5>
9+
</div>
10+
<div class="card-body pt-0">
11+
<div class="widget-49">
12+
<div class="widget-49-title-wrapper">
13+
<div class="widget-49-date-primary">
14+
<span class="widget-49-date-day">N/A</span>
15+
<span class="widget-49-date-month">CVSS</span>
16+
</div>
17+
<div class="widget-49-meeting-info">
18+
<span class="widget-49-pro-title"><b>Vector:</b> N/A</span>
19+
<span class="widget-49-meeting-time">
20+
<a href="https://nvd.nist.gov/vuln/detail/CVE-2021-36369">https://nvd.nist.gov/vuln/detail/CVE-2021-36369</a>
21+
</span>
22+
</div>
23+
</div>
24+
<p class="widget-49-meeting-integration">
25+
<i class="fas fa-check"></i> integrated in SSH-MITM server
26+
</p>
27+
<p class="widget-49-meeting-text">
28+
This CVE is marked as reserved.
29+
</p>
30+
<span class="widget-49-pro-title"><b>Affected Software:</b></span>
31+
<ul class="widget-49-meeting-points">
32+
<li class="widget-49-meeting-item"><b>Dropbear</b> &lt;= 2020.81</li>
33+
</ul>
34+
</div>
35+
</div>
36+
</div>

‎doc/_static/assets/css/theme2.css

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
2+
table.docutils,
3+
.rst-content table.field-list,
4+
.wy-table {
5+
border-collapse: collapse;
6+
border-spacing: 0;
7+
empty-cells: show;
8+
margin-bottom: 24px
9+
}
10+
11+
table.docutils caption,
12+
.rst-content table.field-list caption,
13+
.wy-table caption {
14+
color: #000;
15+
font: italic 85%/1 arial, sans-serif;
16+
padding: 1em 0;
17+
text-align: center
18+
}
19+
20+
table.docutils td,
21+
table.docutils th,
22+
.rst-content table.field-list td,
23+
.rst-content table.field-list th,
24+
.wy-table td,
25+
.wy-table th {
26+
font-size: 90%;
27+
margin: 0;
28+
overflow: visible;
29+
padding: 8px 16px
30+
}
31+
32+
table.docutils td:first-child,
33+
table.docutils th:first-child,
34+
.rst-content table.field-list td:first-child,
35+
.rst-content table.field-list th:first-child,
36+
.wy-table td:first-child,
37+
.wy-table th:first-child {
38+
border-left-width: 0
39+
}
40+
41+
table.docutils thead,
42+
.rst-content table.field-list thead,
43+
.wy-table thead {
44+
color: #000;
45+
text-align: left;
46+
vertical-align: bottom;
47+
white-space: nowrap
48+
}
49+
50+
table.docutils thead th,
51+
.rst-content table.field-list thead th,
52+
.wy-table thead th {
53+
font-weight: 700;
54+
border-bottom: 2px solid #e1e4e5
55+
}
56+
57+
table.docutils td,
58+
.rst-content table.field-list td,
59+
.wy-table td {
60+
background-color: transparent;
61+
vertical-align: middle
62+
}
63+
64+
table.docutils td p,
65+
.rst-content table.field-list td p,
66+
.wy-table td p {
67+
line-height: 18px
68+
}
69+
70+
table.docutils td p:last-child,
71+
.rst-content table.field-list td p:last-child,
72+
.wy-table td p:last-child {
73+
margin-bottom: 0
74+
}
75+
76+
table.docutils .wy-table-cell-min,
77+
.rst-content table.field-list .wy-table-cell-min,
78+
.wy-table .wy-table-cell-min {
79+
width: 1%;
80+
padding-right: 0
81+
}
82+
83+
table.docutils .wy-table-cell-min input[type=checkbox],
84+
.rst-content table.field-list .wy-table-cell-min input[type=checkbox],
85+
.wy-table .wy-table-cell-min input[type=checkbox] {
86+
margin: 0
87+
}
88+
89+
.wy-table-secondary {
90+
color: grey;
91+
font-size: 90%
92+
}
93+
94+
.wy-table-tertiary {
95+
color: grey;
96+
font-size: 80%
97+
}
98+
99+
table.docutils:not(.field-list) tr:nth-child(2n-1) td,
100+
.wy-table-backed,
101+
.wy-table-odd td,
102+
.wy-table-striped tr:nth-child(2n-1) td {
103+
background-color: #f3f6f6
104+
}
105+
106+
table.docutils,
107+
.wy-table-bordered-all {
108+
border: 1px solid #e1e4e5
109+
}
110+
111+
table.docutils td,
112+
.wy-table-bordered-all td {
113+
border-bottom: 1px solid #e1e4e5;
114+
border-left: 1px solid #e1e4e5
115+
}
116+
117+
table.docutils tbody>tr:last-child td,
118+
.wy-table-bordered-all tbody>tr:last-child td {
119+
border-bottom-width: 0
120+
}
121+
122+
table.docutils th {
123+
border-color: #e1e4e5
124+
}
125+
126+
127+
table.docutils td .last,
128+
table.docutils td .last>:last-child {
129+
margin-bottom: 0
130+
}
131+
132+
table.docutils th {
133+
border-color: #e1e4e5
134+
}
135+
136+
137+
table.docutils th {
138+
border: 1px solid #e1e4e5
139+
}
140+
141+
table.docutils td>p,
142+
table.docutils th>p {
143+
line-height: 1rem;
144+
margin-bottom: 0;
145+
font-size: .9rem
146+
}

0 commit comments

Comments
 (0)