check in v3.8.2 source
This commit is contained in:
67
apps/nc/atomicio.c
Normal file
67
apps/nc/atomicio.c
Normal file
@@ -0,0 +1,67 @@
|
||||
/* $OpenBSD: atomicio.c,v 1.11 2012/12/04 02:24:47 deraadt Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2006 Damien Miller. All rights reserved.
|
||||
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
|
||||
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
#include <poll.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "atomicio.h"
|
||||
|
||||
/*
|
||||
* ensure all of data on socket comes through. f==read || f==vwrite
|
||||
*/
|
||||
size_t
|
||||
atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
|
||||
{
|
||||
char *s = _s;
|
||||
size_t pos = 0;
|
||||
ssize_t res;
|
||||
struct pollfd pfd;
|
||||
|
||||
pfd.fd = fd;
|
||||
pfd.events = f == read ? POLLIN : POLLOUT;
|
||||
while (n > pos) {
|
||||
res = (f) (fd, s + pos, n - pos);
|
||||
switch (res) {
|
||||
case -1:
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
if ((errno == EAGAIN) || (errno == ENOBUFS)) {
|
||||
(void)poll(&pfd, 1, -1);
|
||||
continue;
|
||||
}
|
||||
return 0;
|
||||
case 0:
|
||||
errno = EPIPE;
|
||||
return pos;
|
||||
default:
|
||||
pos += (size_t)res;
|
||||
}
|
||||
}
|
||||
return (pos);
|
||||
}
|
39
apps/nc/atomicio.h
Normal file
39
apps/nc/atomicio.h
Normal file
@@ -0,0 +1,39 @@
|
||||
/* $OpenBSD: atomicio.h,v 1.2 2007/09/07 14:50:44 tobias Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Damien Miller. All rights reserved.
|
||||
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _ATOMICIO_H
|
||||
#define _ATOMICIO_H
|
||||
|
||||
/*
|
||||
* Ensure all of data on socket comes through. f==read || f==vwrite
|
||||
*/
|
||||
size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
|
||||
|
||||
#define vwrite (ssize_t (*)(int, void *, size_t))write
|
||||
|
||||
#endif /* _ATOMICIO_H */
|
307
apps/nc/compat/base64.c
Normal file
307
apps/nc/compat/base64.c
Normal file
@@ -0,0 +1,307 @@
|
||||
/* $OpenBSD: base64.c,v 1.15 2021/10/25 14:41:09 jca Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 by Internet Software Consortium.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
||||
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
||||
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||||
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Portions Copyright (c) 1995 by International Business Machines, Inc.
|
||||
*
|
||||
* International Business Machines, Inc. (hereinafter called IBM) grants
|
||||
* permission under its copyrights to use, copy, modify, and distribute this
|
||||
* Software with or without fee, provided that the above copyright notice and
|
||||
* all paragraphs of this notice appear in all copies, and that the name of IBM
|
||||
* not be used in connection with the marketing of any product incorporating
|
||||
* the Software or modifications thereof, without specific, written prior
|
||||
* permission.
|
||||
*
|
||||
* To the extent it has a right to do so, IBM grants an immunity from suit
|
||||
* under its patents, if any, for the use, sale or manufacture of products to
|
||||
* the extent that such products are used for performing Domain Name System
|
||||
* dynamic updates in TCP/IP networks by means of the Software. No immunity is
|
||||
* granted for any product per se or for any other function of any product.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
* PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
|
||||
* DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
|
||||
* IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <resolv.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
static const char Base64[] =
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
static const char Pad64 = '=';
|
||||
|
||||
/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
|
||||
The following encoding technique is taken from RFC 1521 by Borenstein
|
||||
and Freed. It is reproduced here in a slightly edited form for
|
||||
convenience.
|
||||
|
||||
A 65-character subset of US-ASCII is used, enabling 6 bits to be
|
||||
represented per printable character. (The extra 65th character, "=",
|
||||
is used to signify a special processing function.)
|
||||
|
||||
The encoding process represents 24-bit groups of input bits as output
|
||||
strings of 4 encoded characters. Proceeding from left to right, a
|
||||
24-bit input group is formed by concatenating 3 8-bit input groups.
|
||||
These 24 bits are then treated as 4 concatenated 6-bit groups, each
|
||||
of which is translated into a single digit in the base64 alphabet.
|
||||
|
||||
Each 6-bit group is used as an index into an array of 64 printable
|
||||
characters. The character referenced by the index is placed in the
|
||||
output string.
|
||||
|
||||
Table 1: The Base64 Alphabet
|
||||
|
||||
Value Encoding Value Encoding Value Encoding Value Encoding
|
||||
0 A 17 R 34 i 51 z
|
||||
1 B 18 S 35 j 52 0
|
||||
2 C 19 T 36 k 53 1
|
||||
3 D 20 U 37 l 54 2
|
||||
4 E 21 V 38 m 55 3
|
||||
5 F 22 W 39 n 56 4
|
||||
6 G 23 X 40 o 57 5
|
||||
7 H 24 Y 41 p 58 6
|
||||
8 I 25 Z 42 q 59 7
|
||||
9 J 26 a 43 r 60 8
|
||||
10 K 27 b 44 s 61 9
|
||||
11 L 28 c 45 t 62 +
|
||||
12 M 29 d 46 u 63 /
|
||||
13 N 30 e 47 v
|
||||
14 O 31 f 48 w (pad) =
|
||||
15 P 32 g 49 x
|
||||
16 Q 33 h 50 y
|
||||
|
||||
Special processing is performed if fewer than 24 bits are available
|
||||
at the end of the data being encoded. A full encoding quantum is
|
||||
always completed at the end of a quantity. When fewer than 24 input
|
||||
bits are available in an input group, zero bits are added (on the
|
||||
right) to form an integral number of 6-bit groups. Padding at the
|
||||
end of the data is performed using the '=' character.
|
||||
|
||||
Since all base64 input is an integral number of octets, only the
|
||||
-------------------------------------------------
|
||||
following cases can arise:
|
||||
|
||||
(1) the final quantum of encoding input is an integral
|
||||
multiple of 24 bits; here, the final unit of encoded
|
||||
output will be an integral multiple of 4 characters
|
||||
with no "=" padding,
|
||||
(2) the final quantum of encoding input is exactly 8 bits;
|
||||
here, the final unit of encoded output will be two
|
||||
characters followed by two "=" padding characters, or
|
||||
(3) the final quantum of encoding input is exactly 16 bits;
|
||||
here, the final unit of encoded output will be three
|
||||
characters followed by one "=" padding character.
|
||||
*/
|
||||
|
||||
int
|
||||
b64_ntop(unsigned char const *src, size_t srclength, char *target,
|
||||
size_t targsize)
|
||||
{
|
||||
size_t datalength = 0;
|
||||
unsigned char input[3];
|
||||
unsigned char output[4];
|
||||
int i;
|
||||
|
||||
while (2 < srclength) {
|
||||
input[0] = *src++;
|
||||
input[1] = *src++;
|
||||
input[2] = *src++;
|
||||
srclength -= 3;
|
||||
|
||||
output[0] = input[0] >> 2;
|
||||
output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
|
||||
output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
|
||||
output[3] = input[2] & 0x3f;
|
||||
|
||||
if (datalength + 4 > targsize)
|
||||
return (-1);
|
||||
target[datalength++] = Base64[output[0]];
|
||||
target[datalength++] = Base64[output[1]];
|
||||
target[datalength++] = Base64[output[2]];
|
||||
target[datalength++] = Base64[output[3]];
|
||||
}
|
||||
|
||||
/* Now we worry about padding. */
|
||||
if (0 != srclength) {
|
||||
/* Get what's left. */
|
||||
input[0] = input[1] = input[2] = '\0';
|
||||
for (i = 0; i < srclength; i++)
|
||||
input[i] = *src++;
|
||||
|
||||
output[0] = input[0] >> 2;
|
||||
output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
|
||||
output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
|
||||
|
||||
if (datalength + 4 > targsize)
|
||||
return (-1);
|
||||
target[datalength++] = Base64[output[0]];
|
||||
target[datalength++] = Base64[output[1]];
|
||||
if (srclength == 1)
|
||||
target[datalength++] = Pad64;
|
||||
else
|
||||
target[datalength++] = Base64[output[2]];
|
||||
target[datalength++] = Pad64;
|
||||
}
|
||||
if (datalength >= targsize)
|
||||
return (-1);
|
||||
target[datalength] = '\0'; /* Returned value doesn't count \0. */
|
||||
return (datalength);
|
||||
}
|
||||
|
||||
/* skips all whitespace anywhere.
|
||||
converts characters, four at a time, starting at (or after)
|
||||
src from base - 64 numbers into three 8 bit bytes in the target area.
|
||||
it returns the number of data bytes stored at the target, or -1 on error.
|
||||
*/
|
||||
|
||||
int
|
||||
b64_pton(char const *src, unsigned char *target, size_t targsize)
|
||||
{
|
||||
int tarindex, state, ch;
|
||||
unsigned char nextbyte;
|
||||
char *pos;
|
||||
|
||||
state = 0;
|
||||
tarindex = 0;
|
||||
|
||||
while ((ch = (unsigned char)*src++) != '\0') {
|
||||
if (isspace(ch)) /* Skip whitespace anywhere. */
|
||||
continue;
|
||||
|
||||
if (ch == Pad64)
|
||||
break;
|
||||
|
||||
pos = strchr(Base64, ch);
|
||||
if (pos == 0) /* A non-base64 character. */
|
||||
return (-1);
|
||||
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (target) {
|
||||
if (tarindex >= targsize)
|
||||
return (-1);
|
||||
target[tarindex] = (pos - Base64) << 2;
|
||||
}
|
||||
state = 1;
|
||||
break;
|
||||
case 1:
|
||||
if (target) {
|
||||
if (tarindex >= targsize)
|
||||
return (-1);
|
||||
target[tarindex] |= (pos - Base64) >> 4;
|
||||
nextbyte = ((pos - Base64) & 0x0f) << 4;
|
||||
if (tarindex + 1 < targsize)
|
||||
target[tarindex+1] = nextbyte;
|
||||
else if (nextbyte)
|
||||
return (-1);
|
||||
}
|
||||
tarindex++;
|
||||
state = 2;
|
||||
break;
|
||||
case 2:
|
||||
if (target) {
|
||||
if (tarindex >= targsize)
|
||||
return (-1);
|
||||
target[tarindex] |= (pos - Base64) >> 2;
|
||||
nextbyte = ((pos - Base64) & 0x03) << 6;
|
||||
if (tarindex + 1 < targsize)
|
||||
target[tarindex+1] = nextbyte;
|
||||
else if (nextbyte)
|
||||
return (-1);
|
||||
}
|
||||
tarindex++;
|
||||
state = 3;
|
||||
break;
|
||||
case 3:
|
||||
if (target) {
|
||||
if (tarindex >= targsize)
|
||||
return (-1);
|
||||
target[tarindex] |= (pos - Base64);
|
||||
}
|
||||
tarindex++;
|
||||
state = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* We are done decoding Base-64 chars. Let's see if we ended
|
||||
* on a byte boundary, and/or with erroneous trailing characters.
|
||||
*/
|
||||
|
||||
if (ch == Pad64) { /* We got a pad char. */
|
||||
ch = (unsigned char)*src++; /* Skip it, get next. */
|
||||
switch (state) {
|
||||
case 0: /* Invalid = in first position */
|
||||
case 1: /* Invalid = in second position */
|
||||
return (-1);
|
||||
|
||||
case 2: /* Valid, means one byte of info */
|
||||
/* Skip any number of spaces. */
|
||||
for (; ch != '\0'; ch = (unsigned char)*src++)
|
||||
if (!isspace(ch))
|
||||
break;
|
||||
/* Make sure there is another trailing = sign. */
|
||||
if (ch != Pad64)
|
||||
return (-1);
|
||||
ch = (unsigned char)*src++; /* Skip the = */
|
||||
/* Fall through to "single trailing =" case. */
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case 3: /* Valid, means two bytes of info */
|
||||
/*
|
||||
* We know this char is an =. Is there anything but
|
||||
* whitespace after it?
|
||||
*/
|
||||
for (; ch != '\0'; ch = (unsigned char)*src++)
|
||||
if (!isspace(ch))
|
||||
return (-1);
|
||||
|
||||
/*
|
||||
* Now make sure for cases 2 and 3 that the "extra"
|
||||
* bits that slopped past the last full byte were
|
||||
* zeros. If we don't check them, they become a
|
||||
* subliminal channel.
|
||||
*/
|
||||
if (target && tarindex < targsize &&
|
||||
target[tarindex] != 0)
|
||||
return (-1);
|
||||
}
|
||||
} else {
|
||||
/*
|
||||
* We ended by seeing the end of the string. Make sure we
|
||||
* have no partial bytes lying around.
|
||||
*/
|
||||
if (state != 0)
|
||||
return (-1);
|
||||
}
|
||||
|
||||
return (tarindex);
|
||||
}
|
1910
apps/nc/netcat.c
Normal file
1910
apps/nc/netcat.c
Normal file
File diff suppressed because it is too large
Load Diff
400
apps/nc/socks.c
Normal file
400
apps/nc/socks.c
Normal file
@@ -0,0 +1,400 @@
|
||||
/* $OpenBSD: socks.c,v 1.31 2022/06/08 20:20:26 djm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
|
||||
* Copyright (c) 2004, 2005 Damien Miller. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <resolv.h>
|
||||
#include <readpassphrase.h>
|
||||
#include "atomicio.h"
|
||||
|
||||
#define SOCKS_PORT "1080"
|
||||
#define HTTP_PROXY_PORT "3128"
|
||||
#define HTTP_MAXHDRS 64
|
||||
#define SOCKS_V5 5
|
||||
#define SOCKS_V4 4
|
||||
#define SOCKS_NOAUTH 0
|
||||
#define SOCKS_NOMETHOD 0xff
|
||||
#define SOCKS_CONNECT 1
|
||||
#define SOCKS_IPV4 1
|
||||
#define SOCKS_DOMAIN 3
|
||||
#define SOCKS_IPV6 4
|
||||
|
||||
int remote_connect(const char *, const char *, struct addrinfo, char *);
|
||||
int socks_connect(const char *, const char *, struct addrinfo,
|
||||
const char *, const char *, struct addrinfo, int,
|
||||
const char *);
|
||||
|
||||
static int
|
||||
decode_addrport(const char *h, const char *p, struct sockaddr *addr,
|
||||
socklen_t addrlen, int v4only, int numeric)
|
||||
{
|
||||
int r;
|
||||
struct addrinfo hints, *res;
|
||||
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
hints.ai_family = v4only ? PF_INET : PF_UNSPEC;
|
||||
hints.ai_flags = numeric ? AI_NUMERICHOST : 0;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
r = getaddrinfo(h, p, &hints, &res);
|
||||
/* Don't fatal when attempting to convert a numeric address */
|
||||
if (r != 0) {
|
||||
if (!numeric) {
|
||||
errx(1, "getaddrinfo(\"%.64s\", \"%.64s\"): %s", h, p,
|
||||
gai_strerror(r));
|
||||
}
|
||||
return (-1);
|
||||
}
|
||||
if (addrlen < res->ai_addrlen) {
|
||||
freeaddrinfo(res);
|
||||
errx(1, "internal error: addrlen < res->ai_addrlen");
|
||||
}
|
||||
memcpy(addr, res->ai_addr, res->ai_addrlen);
|
||||
freeaddrinfo(res);
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
proxy_read_line(int fd, char *buf, size_t bufsz)
|
||||
{
|
||||
size_t off;
|
||||
|
||||
for(off = 0;;) {
|
||||
if (off >= bufsz)
|
||||
errx(1, "proxy read too long");
|
||||
if (atomicio(read, fd, buf + off, 1) != 1)
|
||||
err(1, "proxy read");
|
||||
/* Skip CR */
|
||||
if (buf[off] == '\r')
|
||||
continue;
|
||||
if (buf[off] == '\n') {
|
||||
buf[off] = '\0';
|
||||
break;
|
||||
}
|
||||
off++;
|
||||
}
|
||||
return (off);
|
||||
}
|
||||
|
||||
static void
|
||||
getproxypass(const char *proxyuser, const char *proxyhost,
|
||||
char *pw, size_t pwlen)
|
||||
{
|
||||
char prompt[512];
|
||||
|
||||
snprintf(prompt, sizeof(prompt), "Proxy password for %s@%s: ",
|
||||
proxyuser, proxyhost);
|
||||
if (readpassphrase(prompt, pw, pwlen, RPP_REQUIRE_TTY) == NULL)
|
||||
errx(1, "Unable to read proxy passphrase");
|
||||
}
|
||||
|
||||
/*
|
||||
* Error strings adapted from the generally accepted SOCKSv4 spec:
|
||||
*
|
||||
* http://ftp.icm.edu.pl/packages/socks/socks4/SOCKS4.protocol
|
||||
*/
|
||||
static const char *
|
||||
socks4_strerror(int e)
|
||||
{
|
||||
switch (e) {
|
||||
case 90:
|
||||
return "Succeeded";
|
||||
case 91:
|
||||
return "Request rejected or failed";
|
||||
case 92:
|
||||
return "SOCKS server cannot connect to identd on the client";
|
||||
case 93:
|
||||
return "Client program and identd report different user-ids";
|
||||
default:
|
||||
return "Unknown error";
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Error strings taken almost directly from RFC 1928.
|
||||
*/
|
||||
static const char *
|
||||
socks5_strerror(int e)
|
||||
{
|
||||
switch (e) {
|
||||
case 0:
|
||||
return "Succeeded";
|
||||
case 1:
|
||||
return "General SOCKS server failure";
|
||||
case 2:
|
||||
return "Connection not allowed by ruleset";
|
||||
case 3:
|
||||
return "Network unreachable";
|
||||
case 4:
|
||||
return "Host unreachable";
|
||||
case 5:
|
||||
return "Connection refused";
|
||||
case 6:
|
||||
return "TTL expired";
|
||||
case 7:
|
||||
return "Command not supported";
|
||||
case 8:
|
||||
return "Address type not supported";
|
||||
default:
|
||||
return "Unknown error";
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
socks_connect(const char *host, const char *port,
|
||||
struct addrinfo hints __attribute__ ((__unused__)),
|
||||
const char *proxyhost, const char *proxyport, struct addrinfo proxyhints,
|
||||
int socksv, const char *proxyuser)
|
||||
{
|
||||
int proxyfd, r, authretry = 0;
|
||||
size_t hlen, wlen;
|
||||
unsigned char buf[1024];
|
||||
size_t cnt;
|
||||
struct sockaddr_storage addr;
|
||||
struct sockaddr_in *in4 = (struct sockaddr_in *)&addr;
|
||||
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&addr;
|
||||
in_port_t serverport;
|
||||
|
||||
if (proxyport == NULL)
|
||||
proxyport = (socksv == -1) ? HTTP_PROXY_PORT : SOCKS_PORT;
|
||||
|
||||
/* Abuse API to lookup port */
|
||||
if (decode_addrport("0.0.0.0", port, (struct sockaddr *)&addr,
|
||||
sizeof(addr), 1, 1) == -1)
|
||||
errx(1, "unknown port \"%.64s\"", port);
|
||||
serverport = in4->sin_port;
|
||||
|
||||
again:
|
||||
if (authretry++ > 3)
|
||||
errx(1, "Too many authentication failures");
|
||||
|
||||
proxyfd = remote_connect(proxyhost, proxyport, proxyhints, NULL);
|
||||
|
||||
if (proxyfd < 0)
|
||||
return (-1);
|
||||
|
||||
if (socksv == 5) {
|
||||
if (decode_addrport(host, port, (struct sockaddr *)&addr,
|
||||
sizeof(addr), 0, 1) == -1)
|
||||
addr.ss_family = 0; /* used in switch below */
|
||||
|
||||
/* Version 5, one method: no authentication */
|
||||
buf[0] = SOCKS_V5;
|
||||
buf[1] = 1;
|
||||
buf[2] = SOCKS_NOAUTH;
|
||||
cnt = atomicio(vwrite, proxyfd, buf, 3);
|
||||
if (cnt != 3)
|
||||
err(1, "write failed (%zu/3)", cnt);
|
||||
|
||||
cnt = atomicio(read, proxyfd, buf, 2);
|
||||
if (cnt != 2)
|
||||
err(1, "read failed (%zu/3)", cnt);
|
||||
|
||||
if (buf[1] == SOCKS_NOMETHOD)
|
||||
errx(1, "authentication method negotiation failed");
|
||||
|
||||
switch (addr.ss_family) {
|
||||
case 0:
|
||||
/* Version 5, connect: domain name */
|
||||
|
||||
/* Max domain name length is 255 bytes */
|
||||
hlen = strlen(host);
|
||||
if (hlen > 255)
|
||||
errx(1, "host name too long for SOCKS5");
|
||||
buf[0] = SOCKS_V5;
|
||||
buf[1] = SOCKS_CONNECT;
|
||||
buf[2] = 0;
|
||||
buf[3] = SOCKS_DOMAIN;
|
||||
buf[4] = hlen;
|
||||
memcpy(buf + 5, host, hlen);
|
||||
memcpy(buf + 5 + hlen, &serverport, sizeof serverport);
|
||||
wlen = 7 + hlen;
|
||||
break;
|
||||
case AF_INET:
|
||||
/* Version 5, connect: IPv4 address */
|
||||
buf[0] = SOCKS_V5;
|
||||
buf[1] = SOCKS_CONNECT;
|
||||
buf[2] = 0;
|
||||
buf[3] = SOCKS_IPV4;
|
||||
memcpy(buf + 4, &in4->sin_addr, sizeof in4->sin_addr);
|
||||
memcpy(buf + 8, &in4->sin_port, sizeof in4->sin_port);
|
||||
wlen = 10;
|
||||
break;
|
||||
case AF_INET6:
|
||||
/* Version 5, connect: IPv6 address */
|
||||
buf[0] = SOCKS_V5;
|
||||
buf[1] = SOCKS_CONNECT;
|
||||
buf[2] = 0;
|
||||
buf[3] = SOCKS_IPV6;
|
||||
memcpy(buf + 4, &in6->sin6_addr, sizeof in6->sin6_addr);
|
||||
memcpy(buf + 20, &in6->sin6_port,
|
||||
sizeof in6->sin6_port);
|
||||
wlen = 22;
|
||||
break;
|
||||
default:
|
||||
errx(1, "internal error: silly AF");
|
||||
}
|
||||
|
||||
cnt = atomicio(vwrite, proxyfd, buf, wlen);
|
||||
if (cnt != wlen)
|
||||
err(1, "write failed (%zu/%zu)", cnt, wlen);
|
||||
|
||||
cnt = atomicio(read, proxyfd, buf, 4);
|
||||
if (cnt != 4)
|
||||
err(1, "read failed (%zu/4)", cnt);
|
||||
if (buf[1] != 0) {
|
||||
errx(1, "connection failed, SOCKSv5 error: %s",
|
||||
socks5_strerror(buf[1]));
|
||||
}
|
||||
switch (buf[3]) {
|
||||
case SOCKS_IPV4:
|
||||
cnt = atomicio(read, proxyfd, buf + 4, 6);
|
||||
if (cnt != 6)
|
||||
err(1, "read failed (%zu/6)", cnt);
|
||||
break;
|
||||
case SOCKS_IPV6:
|
||||
cnt = atomicio(read, proxyfd, buf + 4, 18);
|
||||
if (cnt != 18)
|
||||
err(1, "read failed (%zu/18)", cnt);
|
||||
break;
|
||||
default:
|
||||
errx(1, "connection failed, unsupported address type");
|
||||
}
|
||||
} else if (socksv == 4) {
|
||||
/* This will exit on lookup failure */
|
||||
decode_addrport(host, port, (struct sockaddr *)&addr,
|
||||
sizeof(addr), 1, 0);
|
||||
|
||||
/* Version 4 */
|
||||
buf[0] = SOCKS_V4;
|
||||
buf[1] = SOCKS_CONNECT; /* connect */
|
||||
memcpy(buf + 2, &in4->sin_port, sizeof in4->sin_port);
|
||||
memcpy(buf + 4, &in4->sin_addr, sizeof in4->sin_addr);
|
||||
buf[8] = 0; /* empty username */
|
||||
wlen = 9;
|
||||
|
||||
cnt = atomicio(vwrite, proxyfd, buf, wlen);
|
||||
if (cnt != wlen)
|
||||
err(1, "write failed (%zu/%zu)", cnt, wlen);
|
||||
|
||||
cnt = atomicio(read, proxyfd, buf, 8);
|
||||
if (cnt != 8)
|
||||
err(1, "read failed (%zu/8)", cnt);
|
||||
if (buf[1] != 90) {
|
||||
errx(1, "connection failed, SOCKSv4 error: %s",
|
||||
socks4_strerror(buf[1]));
|
||||
}
|
||||
} else if (socksv == -1) {
|
||||
/* HTTP proxy CONNECT */
|
||||
|
||||
/* Disallow bad chars in hostname */
|
||||
if (strcspn(host, "\r\n\t []") != strlen(host))
|
||||
errx(1, "Invalid hostname");
|
||||
|
||||
/* Try to be sane about numeric IPv6 addresses */
|
||||
if (strchr(host, ':') != NULL) {
|
||||
r = snprintf(buf, sizeof(buf),
|
||||
"CONNECT [%s]:%d HTTP/1.0\r\n",
|
||||
host, ntohs(serverport));
|
||||
} else {
|
||||
r = snprintf(buf, sizeof(buf),
|
||||
"CONNECT %s:%d HTTP/1.0\r\n",
|
||||
host, ntohs(serverport));
|
||||
}
|
||||
if (r < 0 || (size_t)r >= sizeof(buf))
|
||||
errx(1, "hostname too long");
|
||||
r = strlen(buf);
|
||||
|
||||
cnt = atomicio(vwrite, proxyfd, buf, r);
|
||||
if (cnt != r)
|
||||
err(1, "write failed (%zu/%d)", cnt, r);
|
||||
|
||||
if (authretry > 1) {
|
||||
char proxypass[256];
|
||||
char resp[1024];
|
||||
|
||||
getproxypass(proxyuser, proxyhost,
|
||||
proxypass, sizeof proxypass);
|
||||
r = snprintf(buf, sizeof(buf), "%s:%s",
|
||||
proxyuser, proxypass);
|
||||
explicit_bzero(proxypass, sizeof proxypass);
|
||||
if (r == -1 || (size_t)r >= sizeof(buf) ||
|
||||
b64_ntop(buf, strlen(buf), resp,
|
||||
sizeof(resp)) == -1)
|
||||
errx(1, "Proxy username/password too long");
|
||||
r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
|
||||
"Basic %s\r\n", resp);
|
||||
if (r < 0 || (size_t)r >= sizeof(buf))
|
||||
errx(1, "Proxy auth response too long");
|
||||
r = strlen(buf);
|
||||
if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
|
||||
err(1, "write failed (%zu/%d)", cnt, r);
|
||||
explicit_bzero(proxypass, sizeof proxypass);
|
||||
explicit_bzero(buf, sizeof buf);
|
||||
}
|
||||
|
||||
/* Terminate headers */
|
||||
if ((cnt = atomicio(vwrite, proxyfd, "\r\n", 2)) != 2)
|
||||
err(1, "write failed (%zu/2)", cnt);
|
||||
|
||||
/* Read status reply */
|
||||
proxy_read_line(proxyfd, buf, sizeof(buf));
|
||||
if (proxyuser != NULL &&
|
||||
(strncmp(buf, "HTTP/1.0 407 ", 12) == 0 ||
|
||||
strncmp(buf, "HTTP/1.1 407 ", 12) == 0)) {
|
||||
if (authretry > 1) {
|
||||
fprintf(stderr, "Proxy authentication "
|
||||
"failed\n");
|
||||
}
|
||||
close(proxyfd);
|
||||
goto again;
|
||||
} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
|
||||
strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
|
||||
errx(1, "Proxy error: \"%s\"", buf);
|
||||
|
||||
/* Headers continue until we hit an empty line */
|
||||
for (r = 0; r < HTTP_MAXHDRS; r++) {
|
||||
proxy_read_line(proxyfd, buf, sizeof(buf));
|
||||
if (*buf == '\0')
|
||||
break;
|
||||
}
|
||||
if (*buf != '\0')
|
||||
errx(1, "Too many proxy headers received");
|
||||
} else
|
||||
errx(1, "Unknown proxy protocol %d", socksv);
|
||||
|
||||
return (proxyfd);
|
||||
}
|
Reference in New Issue
Block a user