diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
commit | b7e40fa9da0b5491534a429dadb321eab5a77558 (patch) | |
tree | bed1da11e9f829925797aa093e379fc0b5868ecd /regress/cfgmatch.sh | |
parent | 4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
* New upstream release (closes: #395507, #397961, #420035). Important
changes not previously backported to 4.3p2:
- 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+ On portable OpenSSH, fix a GSSAPI authentication abort that could be
used to determine the validity of usernames on some platforms.
+ Implemented conditional configuration in sshd_config(5) using the
"Match" directive. This allows some configuration options to be
selectively overridden if specific criteria (based on user, group,
hostname and/or address) are met. So far a useful subset of
post-authentication options are supported and more are expected to
be added in future releases.
+ Add support for Diffie-Hellman group exchange key agreement with a
final hash of SHA256.
+ Added a "ForceCommand" directive to sshd_config(5). Similar to the
command="..." option accepted in ~/.ssh/authorized_keys, this forces
the execution of the specified command regardless of what the user
requested. This is very useful in conjunction with the new "Match"
option.
+ Add a "PermitOpen" directive to sshd_config(5). This mirrors the
permitopen="..." authorized_keys option, allowing fine-grained
control over the port-forwardings that a user is allowed to
establish.
+ Add optional logging of transactions to sftp-server(8).
+ ssh(1) will now record port numbers for hosts stored in
~/.ssh/known_hosts when a non-standard port has been requested
(closes: #50612).
+ Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
non-zero exit code) when requested port forwardings could not be
established.
+ Extend sshd_config(5) "SubSystem" declarations to allow the
specification of command-line arguments.
+ Replacement of all integer overflow susceptible invocations of
malloc(3) and realloc(3) with overflow-checking equivalents.
+ Many manpage fixes and improvements.
+ Add optional support for OpenSSL hardware accelerators (engines),
enabled using the --with-ssl-engine configure option.
+ Tokens in configuration files may be double-quoted in order to
contain spaces (closes: #319639).
+ Move a debug() call out of a SIGCHLD handler, fixing a hang when the
session exits very quickly (closes: #307890).
+ Fix some incorrect buffer allocation calculations (closes: #410599).
+ ssh-add doesn't ask for a passphrase if key file permissions are too
liberal (closes: #103677).
+ Likewise, ssh doesn't ask either (closes: #99675).
- 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+ sshd now allows the enabling and disabling of authentication methods
on a per user, group, host and network basis via the Match directive
in sshd_config.
+ Fixed an inconsistent check for a terminal when displaying scp
progress meter (closes: #257524).
+ Fix "hang on exit" when background processes are running at the time
of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
install ChangeLog.gssapi.
Diffstat (limited to 'regress/cfgmatch.sh')
-rw-r--r-- | regress/cfgmatch.sh | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh new file mode 100644 index 000000000..d987dcb97 --- /dev/null +++ b/regress/cfgmatch.sh | |||
@@ -0,0 +1,106 @@ | |||
1 | # $OpenBSD: cfgmatch.sh,v 1.2 2006/07/22 01:50:00 dtucker Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="sshd_config match" | ||
5 | |||
6 | pidfile=$OBJ/remote_pid | ||
7 | fwdport=3301 | ||
8 | fwd="-L $fwdport:127.0.0.1:$PORT" | ||
9 | |||
10 | stop_client() | ||
11 | { | ||
12 | pid=`cat $pidfile` | ||
13 | if [ ! -z "$pid" ]; then | ||
14 | kill $pid | ||
15 | sleep 1 | ||
16 | fi | ||
17 | } | ||
18 | |||
19 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak | ||
20 | |||
21 | echo "PermitOpen 127.0.0.1:1" >>$OBJ/sshd_config | ||
22 | echo "Match Address 127.0.0.1" >>$OBJ/sshd_config | ||
23 | echo "PermitOpen 127.0.0.1:$PORT" >>$OBJ/sshd_config | ||
24 | |||
25 | echo "PermitOpen 127.0.0.1:1" >>$OBJ/sshd_proxy | ||
26 | echo "Match Address 127.0.0.1" >>$OBJ/sshd_proxy | ||
27 | echo "PermitOpen 127.0.0.1:$PORT" >>$OBJ/sshd_proxy | ||
28 | |||
29 | start_sshd | ||
30 | |||
31 | #set -x | ||
32 | |||
33 | # Test Match + PermitOpen in sshd_config. This should be permitted | ||
34 | for p in 1 2; do | ||
35 | rm -f $pidfile | ||
36 | trace "match permitopen localhost proto $p" | ||
37 | ${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \ | ||
38 | "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ | ||
39 | fail "match permitopen proto $p sshd failed" | ||
40 | sleep 1; | ||
41 | ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \ | ||
42 | fail "match permitopen permit proto $p" | ||
43 | stop_client | ||
44 | done | ||
45 | |||
46 | # Same but from different source. This should not be permitted | ||
47 | for p in 1 2; do | ||
48 | rm -f $pidfile | ||
49 | trace "match permitopen proxy proto $p" | ||
50 | ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ | ||
51 | "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ | ||
52 | fail "match permitopen proxy proto $p sshd failed" | ||
53 | sleep 1; | ||
54 | ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ | ||
55 | fail "match permitopen deny proto $p" | ||
56 | stop_client | ||
57 | done | ||
58 | |||
59 | # Retry previous with key option, should also be denied. | ||
60 | echo -n 'permitopen="127.0.0.1:'$PORT'" ' >$OBJ/authorized_keys_$USER | ||
61 | cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER | ||
62 | echo -n 'permitopen="127.0.0.1:'$PORT'" ' >>$OBJ/authorized_keys_$USER | ||
63 | cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER | ||
64 | for p in 1 2; do | ||
65 | rm -f $pidfile | ||
66 | trace "match permitopen proxy w/key opts proto $p" | ||
67 | ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ | ||
68 | "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ | ||
69 | fail "match permitopen w/key opt proto $p sshd failed" | ||
70 | sleep 1; | ||
71 | ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ | ||
72 | fail "match permitopen deny w/key opt proto $p" | ||
73 | stop_client | ||
74 | done | ||
75 | |||
76 | # Test both sshd_config and key options permitting the same dst/port pair. | ||
77 | # Should be permitted. | ||
78 | for p in 1 2; do | ||
79 | rm -f $pidfile | ||
80 | trace "match permitopen localhost proto $p" | ||
81 | ${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \ | ||
82 | "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ | ||
83 | fail "match permitopen proto $p sshd failed" | ||
84 | sleep 1; | ||
85 | ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \ | ||
86 | fail "match permitopen permit proto $p" | ||
87 | stop_client | ||
88 | done | ||
89 | |||
90 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy | ||
91 | echo "PermitOpen 127.0.0.1:1 127.0.0.1:$PORT 127.0.0.2:2" >>$OBJ/sshd_proxy | ||
92 | echo "Match User $USER" >>$OBJ/sshd_proxy | ||
93 | echo "PermitOpen 127.0.0.1:1 127.0.0.1:2" >>$OBJ/sshd_proxy | ||
94 | |||
95 | # Test that a Match overrides a PermitOpen in the global section | ||
96 | for p in 1 2; do | ||
97 | rm -f $pidfile | ||
98 | trace "match permitopen proxy w/key opts proto $p" | ||
99 | ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ | ||
100 | "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ | ||
101 | fail "match override permitopen proto $p sshd failed" | ||
102 | sleep 1; | ||
103 | ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ | ||
104 | fail "match override permitopen proto $p" | ||
105 | stop_client | ||
106 | done | ||