Mercurial > dropbear
annotate svr-tcpfwd.c @ 693:f31fce2430e8 sha2
increase MAX_MAC_LEN for sha2
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 29 Jun 2012 23:24:39 +0800 |
| parents | dfdb9d9189ff |
| children | c19acba28590 |
| rev | line source |
|---|---|
|
74
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
1 /* |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
2 * Dropbear SSH |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
3 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
4 * Copyright (c) 2002,2003 Matt Johnston |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
5 * Copyright (c) 2004 by Mihnea Stoenescu |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
6 * All rights reserved. |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
7 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
8 * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
9 * of this software and associated documentation files (the "Software"), to deal |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
10 * in the Software without restriction, including without limitation the rights |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
12 * copies of the Software, and to permit persons to whom the Software is |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
13 * furnished to do so, subject to the following conditions: |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
14 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
15 * The above copyright notice and this permission notice shall be included in |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
16 * all copies or substantial portions of the Software. |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
17 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
24 * SOFTWARE. */ |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
70
diff
changeset
|
25 |
| 62 | 26 #include "includes.h" |
| 27 #include "ssh.h" | |
| 64 | 28 #include "tcpfwd.h" |
| 62 | 29 #include "dbutil.h" |
| 30 #include "session.h" | |
| 31 #include "buffer.h" | |
| 32 #include "packet.h" | |
| 33 #include "listener.h" | |
| 34 #include "runopts.h" | |
|
475
52a644e7b8e1
* Patch from Frédéric Moulins adding options to authorized_keys.
Matt Johnston <matt@ucc.asn.au>
parents:
410
diff
changeset
|
35 #include "auth.h" |
| 62 | 36 |
|
673
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
37 static void send_msg_request_failure(); |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
38 |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
39 static void send_msg_request_failure() { |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
40 CHECKCLEARTOWRITE(); |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
41 buf_putbyte(ses.writepayload, SSH_MSG_REQUEST_FAILURE); |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
42 encrypt_packet(); |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
43 } |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
44 |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
45 #ifndef ENABLE_SVR_REMOTETCPFWD |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
46 |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
47 /* This is better than SSH_MSG_UNIMPLEMENTED */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
48 void recv_msg_global_request_remotetcp() { |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
49 TRACE(("recv_msg_global_request_remotetcp: remote tcp forwarding not compiled in")) |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
50 send_msg_request_failure(); |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
51 } |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
52 |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
53 /* */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
54 #endif /* !ENABLE_SVR_REMOTETCPFWD */ |
| 62 | 55 |
| 56 static void send_msg_request_success(); | |
| 57 static int svr_cancelremotetcp(); | |
| 58 static int svr_remotetcpreq(); | |
| 64 | 59 static int newtcpdirect(struct Channel * channel); |
| 62 | 60 |
|
673
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
61 #ifdef ENABLE_SVR_REMOTETCPFWD |
| 62 | 62 static const struct ChanType svr_chan_tcpremote = { |
| 63 1, /* sepfds */ | |
| 64 "forwarded-tcpip", | |
| 65 NULL, | |
| 66 NULL, | |
| 67 NULL, | |
| 68 NULL | |
| 69 }; | |
| 70 | |
| 71 /* At the moment this is completely used for tcp code (with the name reflecting | |
| 72 * that). If new request types are added, this should be replaced with code | |
| 73 * similar to the request-switching in chansession.c */ | |
| 74 void recv_msg_global_request_remotetcp() { | |
| 75 | |
| 76 unsigned char* reqname = NULL; | |
| 77 unsigned int namelen; | |
| 78 unsigned int wantreply = 0; | |
| 79 int ret = DROPBEAR_FAILURE; | |
| 80 | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
81 TRACE(("enter recv_msg_global_request_remotetcp")) |
| 62 | 82 |
|
475
52a644e7b8e1
* Patch from Frédéric Moulins adding options to authorized_keys.
Matt Johnston <matt@ucc.asn.au>
parents:
410
diff
changeset
|
83 if (svr_opts.noremotetcp || !svr_pubkey_allows_tcpfwd()) { |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
84 TRACE(("leave recv_msg_global_request_remotetcp: remote tcp forwarding disabled")) |
| 62 | 85 goto out; |
| 86 } | |
| 87 | |
| 88 reqname = buf_getstring(ses.payload, &namelen); | |
|
179
161557a9dde8
* fix longstanding bug with connections being closed on failure to
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
89 wantreply = buf_getbool(ses.payload); |
| 62 | 90 |
|
267
7ce577234a10
* svr-tcpfwd.c: should be MAX_NAME_LEN not MAXNAMLEN
Matt Johnston <matt@ucc.asn.au>
parents:
259
diff
changeset
|
91 if (namelen > MAX_NAME_LEN) { |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
92 TRACE(("name len is wrong: %d", namelen)) |
| 62 | 93 goto out; |
| 94 } | |
| 95 | |
| 96 if (strcmp("tcpip-forward", reqname) == 0) { | |
| 97 ret = svr_remotetcpreq(); | |
| 98 } else if (strcmp("cancel-tcpip-forward", reqname) == 0) { | |
| 99 ret = svr_cancelremotetcp(); | |
| 100 } else { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
101 TRACE(("reqname isn't tcpip-forward: '%s'", reqname)) |
| 62 | 102 } |
| 103 | |
| 104 out: | |
| 105 if (wantreply) { | |
| 106 if (ret == DROPBEAR_SUCCESS) { | |
| 107 send_msg_request_success(); | |
| 108 } else { | |
| 109 send_msg_request_failure(); | |
| 110 } | |
| 111 } | |
| 112 | |
| 113 m_free(reqname); | |
| 114 | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
115 TRACE(("leave recv_msg_global_request")) |
| 62 | 116 } |
| 117 | |
| 118 | |
| 119 static void send_msg_request_success() { | |
| 120 | |
| 121 CHECKCLEARTOWRITE(); | |
| 122 buf_putbyte(ses.writepayload, SSH_MSG_REQUEST_SUCCESS); | |
| 123 encrypt_packet(); | |
| 124 | |
| 125 } | |
| 126 | |
| 127 static int matchtcp(void* typedata1, void* typedata2) { | |
| 128 | |
| 129 const struct TCPListener *info1 = (struct TCPListener*)typedata1; | |
| 130 const struct TCPListener *info2 = (struct TCPListener*)typedata2; | |
| 131 | |
|
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
132 return (info1->listenport == info2->listenport) |
| 62 | 133 && (info1->chantype == info2->chantype) |
|
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
134 && (strcmp(info1->listenaddr, info2->listenaddr) == 0); |
| 62 | 135 } |
| 136 | |
| 137 static int svr_cancelremotetcp() { | |
| 138 | |
| 139 int ret = DROPBEAR_FAILURE; | |
| 140 unsigned char * bindaddr = NULL; | |
| 141 unsigned int addrlen; | |
| 142 unsigned int port; | |
| 143 struct Listener * listener = NULL; | |
| 144 struct TCPListener tcpinfo; | |
| 145 | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
146 TRACE(("enter cancelremotetcp")) |
| 62 | 147 |
| 148 bindaddr = buf_getstring(ses.payload, &addrlen); | |
| 149 if (addrlen > MAX_IP_LEN) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
150 TRACE(("addr len too long: %d", addrlen)) |
| 62 | 151 goto out; |
| 152 } | |
| 153 | |
| 154 port = buf_getint(ses.payload); | |
| 155 | |
|
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
156 tcpinfo.sendaddr = NULL; |
|
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
157 tcpinfo.sendport = 0; |
|
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
158 tcpinfo.listenaddr = bindaddr; |
|
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
159 tcpinfo.listenport = port; |
| 62 | 160 listener = get_listener(CHANNEL_ID_TCPFORWARDED, &tcpinfo, matchtcp); |
| 161 if (listener) { | |
| 162 remove_listener( listener ); | |
| 163 ret = DROPBEAR_SUCCESS; | |
| 164 } | |
| 165 | |
| 166 out: | |
| 167 m_free(bindaddr); | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
168 TRACE(("leave cancelremotetcp")) |
| 62 | 169 return ret; |
| 170 } | |
| 171 | |
| 172 static int svr_remotetcpreq() { | |
| 173 | |
| 174 int ret = DROPBEAR_FAILURE; | |
|
675
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
175 unsigned char * request_addr = NULL; |
| 62 | 176 unsigned int addrlen; |
| 177 struct TCPListener *tcpinfo = NULL; | |
| 178 unsigned int port; | |
| 179 | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
180 TRACE(("enter remotetcpreq")) |
| 62 | 181 |
|
675
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
182 request_addr = buf_getstring(ses.payload, &addrlen); |
| 62 | 183 if (addrlen > MAX_IP_LEN) { |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
184 TRACE(("addr len too long: %d", addrlen)) |
| 62 | 185 goto out; |
| 186 } | |
| 187 | |
| 188 port = buf_getint(ses.payload); | |
| 189 | |
| 190 if (port == 0) { | |
| 191 dropbear_log(LOG_INFO, "Server chosen tcpfwd ports are unsupported"); | |
| 192 goto out; | |
| 193 } | |
| 194 | |
| 195 if (port < 1 || port > 65535) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
196 TRACE(("invalid port: %d", port)) |
| 62 | 197 goto out; |
| 198 } | |
| 199 | |
| 200 if (!ses.allowprivport && port < IPPORT_RESERVED) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
201 TRACE(("can't assign port < 1024 for non-root")) |
| 62 | 202 goto out; |
| 203 } | |
| 204 | |
| 205 tcpinfo = (struct TCPListener*)m_malloc(sizeof(struct TCPListener)); | |
|
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
206 tcpinfo->sendaddr = NULL; |
|
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
253
diff
changeset
|
207 tcpinfo->sendport = 0; |
| 64 | 208 tcpinfo->listenport = port; |
| 62 | 209 tcpinfo->chantype = &svr_chan_tcpremote; |
|
259
c049490e43fe
* fix -L forwarding on the client, broke last rev
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
210 tcpinfo->tcp_type = forwarded; |
| 62 | 211 |
|
675
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
212 tcpinfo->request_listenaddr = request_addr; |
|
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
213 if (!opts.listen_fwd_all || (strcmp(request_addr, "localhost") == 0) ) { |
|
577
69e98c45db7c
- Progress for allowing specifying a listenaddr for tcp forwards
Matt Johnston <matt@ucc.asn.au>
parents:
475
diff
changeset
|
214 // NULL means "localhost only" |
|
675
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
215 tcpinfo->listenaddr = NULL; |
|
577
69e98c45db7c
- Progress for allowing specifying a listenaddr for tcp forwards
Matt Johnston <matt@ucc.asn.au>
parents:
475
diff
changeset
|
216 } |
|
675
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
217 else |
|
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
218 { |
|
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
219 tcpinfo->listenaddr = request_addr; |
|
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
220 } |
|
577
69e98c45db7c
- Progress for allowing specifying a listenaddr for tcp forwards
Matt Johnston <matt@ucc.asn.au>
parents:
475
diff
changeset
|
221 |
| 62 | 222 ret = listen_tcpfwd(tcpinfo); |
| 223 | |
| 224 out: | |
| 225 if (ret == DROPBEAR_FAILURE) { | |
| 226 /* we only free it if a listener wasn't created, since the listener | |
| 227 * has to remember it if it's to be cancelled */ | |
|
675
dfdb9d9189ff
Server shouldn't return "localhost" in response to -R forward connections
Matt Johnston <matt@ucc.asn.au>
parents:
673
diff
changeset
|
228 m_free(request_addr); |
| 62 | 229 m_free(tcpinfo); |
| 230 } | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
231 TRACE(("leave remotetcpreq")) |
| 62 | 232 return ret; |
| 233 } | |
| 64 | 234 |
|
673
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
235 #endif /* ENABLE_SVR_REMOTETCPFWD */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
236 |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
237 #ifdef ENABLE_SVR_LOCALTCPFWD |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
238 |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
239 const struct ChanType svr_chan_tcpdirect = { |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
240 1, /* sepfds */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
241 "direct-tcpip", |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
242 newtcpdirect, /* init */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
243 NULL, /* checkclose */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
244 NULL, /* reqhandler */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
245 NULL /* closehandler */ |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
246 }; |
|
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
247 |
| 64 | 248 /* Called upon creating a new direct tcp channel (ie we connect out to an |
| 249 * address */ | |
| 250 static int newtcpdirect(struct Channel * channel) { | |
| 251 | |
| 252 unsigned char* desthost = NULL; | |
| 253 unsigned int destport; | |
| 254 unsigned char* orighost = NULL; | |
| 255 unsigned int origport; | |
| 256 char portstring[NI_MAXSERV]; | |
| 257 int sock; | |
| 258 int len; | |
|
70
b0316ce64e4b
Merging in the changes from 0.41-0.43 main Dropbear tree
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
259 int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED; |
| 64 | 260 |
|
475
52a644e7b8e1
* Patch from Frédéric Moulins adding options to authorized_keys.
Matt Johnston <matt@ucc.asn.au>
parents:
410
diff
changeset
|
261 if (svr_opts.nolocaltcp || !svr_pubkey_allows_tcpfwd()) { |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
262 TRACE(("leave newtcpdirect: local tcp forwarding disabled")) |
| 64 | 263 goto out; |
| 264 } | |
| 265 | |
| 266 desthost = buf_getstring(ses.payload, &len); | |
| 267 if (len > MAX_HOST_LEN) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
268 TRACE(("leave newtcpdirect: desthost too long")) |
| 64 | 269 goto out; |
| 270 } | |
| 271 | |
| 272 destport = buf_getint(ses.payload); | |
| 273 | |
| 274 orighost = buf_getstring(ses.payload, &len); | |
| 275 if (len > MAX_HOST_LEN) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
276 TRACE(("leave newtcpdirect: orighost too long")) |
| 64 | 277 goto out; |
| 278 } | |
| 279 | |
| 280 origport = buf_getint(ses.payload); | |
| 281 | |
| 282 /* best be sure */ | |
| 283 if (origport > 65535 || destport > 65535) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
284 TRACE(("leave newtcpdirect: port > 65535")) |
| 64 | 285 goto out; |
| 286 } | |
| 287 | |
| 288 snprintf(portstring, sizeof(portstring), "%d", destport); | |
| 289 sock = connect_remote(desthost, portstring, 1, NULL); | |
| 290 if (sock < 0) { | |
|
70
b0316ce64e4b
Merging in the changes from 0.41-0.43 main Dropbear tree
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
291 err = SSH_OPEN_CONNECT_FAILED; |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
292 TRACE(("leave newtcpdirect: sock failed")) |
| 64 | 293 goto out; |
| 294 } | |
| 295 | |
| 296 ses.maxfd = MAX(ses.maxfd, sock); | |
| 297 | |
|
253
84925eceeb13
* rename infd/outfd to writefd/readfd, to avoid confusion
Matt Johnston <matt@ucc.asn.au>
parents:
179
diff
changeset
|
298 /* We don't set readfd, that will get set after the connection's |
| 64 | 299 * progress succeeds */ |
|
253
84925eceeb13
* rename infd/outfd to writefd/readfd, to avoid confusion
Matt Johnston <matt@ucc.asn.au>
parents:
179
diff
changeset
|
300 channel->writefd = sock; |
| 64 | 301 channel->initconn = 1; |
| 302 | |
|
70
b0316ce64e4b
Merging in the changes from 0.41-0.43 main Dropbear tree
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
303 err = SSH_OPEN_IN_PROGRESS; |
| 64 | 304 |
| 305 out: | |
| 306 m_free(desthost); | |
| 307 m_free(orighost); | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
156
diff
changeset
|
308 TRACE(("leave newtcpdirect: err %d", err)) |
|
70
b0316ce64e4b
Merging in the changes from 0.41-0.43 main Dropbear tree
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
309 return err; |
| 64 | 310 } |
| 311 | |
|
673
c519b78b6d1a
- Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD
Matt Johnston <matt@ucc.asn.au>
parents:
620
diff
changeset
|
312 #endif /* ENABLE_SVR_LOCALTCPFWD */ |