nginx: src/core/ngx_proxy_protocol.c annotate

annotate src/core/ngx_proxy_protocol.c @ 7590:06b01840bd42

Core: moved PROXY protocol fields out of ngx_connection_t. Now a new structure ngx_proxy_protocol_t holds these fields. This allows to add more PROXY protocol fields in the future without modifying the connection structure.

author	Roman Arutyunyan <arut@nginx.com>
date	Mon, 21 Oct 2019 18:06:19 +0300
parents	1fd992589ffe
children	89adf49fe76a

rev	line source
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	1
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	2 /*
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	3 * Copyright (C) Roman Arutyunyan
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	4 * Copyright (C) Nginx, Inc.
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	5 */
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	6
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	7
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	8 #include <ngx_config.h>
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	9 #include <ngx_core.h>
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	10
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	11
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	12 #define NGX_PROXY_PROTOCOL_AF_INET 1
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	13 #define NGX_PROXY_PROTOCOL_AF_INET6 2
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	14
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	15
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	16 #define ngx_proxy_protocol_parse_uint16(p) ((p)[0] << 8 \| (p)[1])
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	17
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	18
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	19 typedef struct {
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	20 u_char signature[12];
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	21 u_char version_command;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	22 u_char family_transport;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	23 u_char len[2];
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	24 } ngx_proxy_protocol_header_t;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	25
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	26
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	27 typedef struct {
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	28 u_char src_addr[4];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	29 u_char dst_addr[4];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	30 u_char src_port[2];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	31 u_char dst_port[2];
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	32 } ngx_proxy_protocol_inet_addrs_t;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	33
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	34
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	35 typedef struct {
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	36 u_char src_addr[16];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	37 u_char dst_addr[16];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	38 u_char src_port[2];
1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	39 u_char dst_port[2];
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	40 } ngx_proxy_protocol_inet6_addrs_t;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	41
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	42
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	43 static u_char ngx_proxy_protocol_v2_read(ngx_connection_t c, u_char *buf,
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	44 u_char *last);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	45
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	46
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	47 u_char *
6185 a420cb1c170b Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read. Roman Arutyunyan <arut@nginx.com> parents: 6184 diff changeset	48 ngx_proxy_protocol_read(ngx_connection_t c, u_char buf, u_char *last)
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	49 {
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	50 size_t len;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	51 u_char ch, p, addr, *port;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	52 ngx_int_t n;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	53 ngx_proxy_protocol_t *pp;
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	54
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	55 static const u_char signature[] = "\r\n\r\n\0\r\nQUIT\n";
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	56
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	57 p = buf;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	58 len = last - buf;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	59
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	60 if (len >= sizeof(ngx_proxy_protocol_header_t)
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	61 && memcmp(p, signature, sizeof(signature) - 1) == 0)
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	62 {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	63 return ngx_proxy_protocol_v2_read(c, buf, last);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	64 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	65
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	66 if (len < 8 \|\| ngx_strncmp(p, "PROXY ", 6) != 0) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	67 goto invalid;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	68 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	69
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	70 p += 6;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	71 len -= 6;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	72
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	73 if (len >= 7 && ngx_strncmp(p, "UNKNOWN", 7) == 0) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	74 ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0,
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	75 "PROXY protocol unknown protocol");
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	76 p += 7;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	77 goto skip;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	78 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	79
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	80 if (len < 5 \|\| ngx_strncmp(p, "TCP", 3) != 0
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	81 \|\| (p[3] != '4' && p[3] != '6') \|\| p[4] != ' ')
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	82 {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	83 goto invalid;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	84 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	85
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	86 p += 5;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	87 addr = p;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	88
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	89 for ( ;; ) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	90 if (p == last) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	91 goto invalid;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	92 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	93
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	94 ch = *p++;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	95
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	96 if (ch == ' ') {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	97 break;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	98 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	99
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	100 if (ch != ':' && ch != '.'
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	101 && (ch < 'a' \|\| ch > 'f')
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	102 && (ch < 'A' \|\| ch > 'F')
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	103 && (ch < '0' \|\| ch > '9'))
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	104 {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	105 goto invalid;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	106 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	107 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	108
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	109 pp = ngx_pcalloc(c->pool, sizeof(ngx_proxy_protocol_t));
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	110 if (pp == NULL) {
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	111 return NULL;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	112 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	113
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	114 len = p - addr - 1;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	115
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	116 pp->src_addr.data = ngx_pnalloc(c->pool, len);
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	117 if (pp->src_addr.data == NULL) {
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	118 return NULL;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	119 }
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	120
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	121 ngx_memcpy(pp->src_addr.data, addr, len);
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	122 pp->src_addr.len = len;
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	123
6561 28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	124 for ( ;; ) {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	125 if (p == last) {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	126 goto invalid;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	127 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	128
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	129 if (*p++ == ' ') {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	130 break;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	131 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	132 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	133
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	134 port = p;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	135
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	136 for ( ;; ) {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	137 if (p == last) {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	138 goto invalid;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	139 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	140
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	141 if (*p++ == ' ') {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	142 break;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	143 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	144 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	145
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	146 len = p - port - 1;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	147
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	148 n = ngx_atoi(port, len);
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	149
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	150 if (n < 0 \|\| n > 65535) {
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	151 goto invalid;
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	152 }
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	153
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	154 pp->src_port = (in_port_t) n;
6561 28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	155
28c76d9d75b7 Added the $proxy_protocol_port variable. Dmitry Volyntsev <xeioex@nginx.com> parents: 6185 diff changeset	156 ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	157 "PROXY protocol address: %V %d", &pp->src_addr,
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	158 pp->src_port);
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	159
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	160 c->proxy_protocol = pp;
5605 3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	161
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	162 skip:
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	163
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	164 for ( /* void */ ; p < last - 1; p++) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	165 if (p[0] == CR && p[1] == LF) {
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	166 return p + 2;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	167 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	168 }
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	169
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	170 invalid:
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	171
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	172 ngx_log_error(NGX_LOG_ERR, c->log, 0,
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	173 "broken header: \"%*s\"", (size_t) (last - buf), buf);
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	174
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	175 return NULL;
3a72b1805c52 Added server-side support for PROXY protocol v1 (ticket #355). Roman Arutyunyan <arut@nginx.com> parents: diff changeset	176 }
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	177
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	178
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	179 u_char *
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	180 ngx_proxy_protocol_write(ngx_connection_t c, u_char buf, u_char *last)
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	181 {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	182 ngx_uint_t port, lport;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	183
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	184 if (last - buf < NGX_PROXY_PROTOCOL_MAX_HEADER) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	185 return NULL;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	186 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	187
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	188 if (ngx_connection_local_sockaddr(c, NULL, 0) != NGX_OK) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	189 return NULL;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	190 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	191
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	192 switch (c->sockaddr->sa_family) {
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	193
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	194 case AF_INET:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	195 buf = ngx_cpymem(buf, "PROXY TCP4 ", sizeof("PROXY TCP4 ") - 1);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	196 break;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	197
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	198 #if (NGX_HAVE_INET6)
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	199 case AF_INET6:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	200 buf = ngx_cpymem(buf, "PROXY TCP6 ", sizeof("PROXY TCP6 ") - 1);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	201 break;
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	202 #endif
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	203
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	204 default:
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	205 return ngx_cpymem(buf, "PROXY UNKNOWN" CRLF,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	206 sizeof("PROXY UNKNOWN" CRLF) - 1);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	207 }
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	208
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	209 buf += ngx_sock_ntop(c->sockaddr, c->socklen, buf, last - buf, 0);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	210
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	211 *buf++ = ' ';
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	212
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	213 buf += ngx_sock_ntop(c->local_sockaddr, c->local_socklen, buf, last - buf,
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	214 0);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	215
6593 b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6561 diff changeset	216 port = ngx_inet_get_port(c->sockaddr);
b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6561 diff changeset	217 lport = ngx_inet_get_port(c->local_sockaddr);
b3b7e33083ac Introduced ngx_inet_get_port() and ngx_inet_set_port() functions. Roman Arutyunyan <arut@nginx.com> parents: 6561 diff changeset	218
6184 fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	219 return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport);
fa663739e115 Stream: client-side PROXY protocol. Roman Arutyunyan <arut@nginx.com> parents: 5605 diff changeset	220 }
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	221
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	222
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	223 static u_char *
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	224 ngx_proxy_protocol_v2_read(ngx_connection_t c, u_char buf, u_char *last)
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	225 {
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	226 u_char *end;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	227 size_t len;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	228 socklen_t socklen;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	229 ngx_uint_t version, command, family, transport;
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	230 ngx_sockaddr_t sockaddr;
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	231 ngx_proxy_protocol_t *pp;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	232 ngx_proxy_protocol_header_t *header;
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	233 ngx_proxy_protocol_inet_addrs_t *in;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	234 #if (NGX_HAVE_INET6)
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	235 ngx_proxy_protocol_inet6_addrs_t *in6;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	236 #endif
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	237
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	238 header = (ngx_proxy_protocol_header_t *) buf;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	239
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	240 buf += sizeof(ngx_proxy_protocol_header_t);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	241
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	242 version = header->version_command >> 4;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	243
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	244 if (version != 2) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	245 ngx_log_error(NGX_LOG_ERR, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	246 "unknown PROXY protocol version: %ui", version);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	247 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	248 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	249
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	250 len = ngx_proxy_protocol_parse_uint16(header->len);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	251
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	252 if ((size_t) (last - buf) < len) {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	253 ngx_log_error(NGX_LOG_ERR, c->log, 0, "header is too large");
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	254 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	255 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	256
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	257 end = buf + len;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	258
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	259 command = header->version_command & 0x0f;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	260
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	261 /* only PROXY is supported */
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	262 if (command != 1) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	263 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	264 "PROXY protocol v2 unsupported command %ui", command);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	265 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	266 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	267
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	268 transport = header->family_transport & 0x0f;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	269
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	270 /* only STREAM is supported */
63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	271 if (transport != 1) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	272 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	273 "PROXY protocol v2 unsupported transport %ui",
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	274 transport);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	275 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	276 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	277
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	278 pp = ngx_pcalloc(c->pool, sizeof(ngx_proxy_protocol_t));
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	279 if (pp == NULL) {
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	280 return NULL;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	281 }
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	282
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	283 family = header->family_transport >> 4;
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	284
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	285 switch (family) {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	286
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	287 case NGX_PROXY_PROTOCOL_AF_INET:
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	288
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	289 if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet_addrs_t)) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	290 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	291 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	292
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	293 in = (ngx_proxy_protocol_inet_addrs_t *) buf;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	294
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	295 sockaddr.sockaddr_in.sin_family = AF_INET;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	296 sockaddr.sockaddr_in.sin_port = 0;
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	297 memcpy(&sockaddr.sockaddr_in.sin_addr, in->src_addr, 4);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	298
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	299 pp->src_port = ngx_proxy_protocol_parse_uint16(in->src_port);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	300
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	301 socklen = sizeof(struct sockaddr_in);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	302
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	303 buf += sizeof(ngx_proxy_protocol_inet_addrs_t);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	304
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	305 break;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	306
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	307 #if (NGX_HAVE_INET6)
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	308
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	309 case NGX_PROXY_PROTOCOL_AF_INET6:
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	310
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	311 if ((size_t) (end - buf) < sizeof(ngx_proxy_protocol_inet6_addrs_t)) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	312 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	313 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	314
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	315 in6 = (ngx_proxy_protocol_inet6_addrs_t *) buf;
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	316
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	317 sockaddr.sockaddr_in6.sin6_family = AF_INET6;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	318 sockaddr.sockaddr_in6.sin6_port = 0;
7254 1fd992589ffe Core: fixed build, broken by 63e91f263a49. Vladimir Homutov <vl@nginx.com> parents: 7253 diff changeset	319 memcpy(&sockaddr.sockaddr_in6.sin6_addr, in6->src_addr, 16);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	320
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	321 pp->src_port = ngx_proxy_protocol_parse_uint16(in6->src_port);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	322
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	323 socklen = sizeof(struct sockaddr_in6);
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	324
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	325 buf += sizeof(ngx_proxy_protocol_inet6_addrs_t);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	326
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	327 break;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	328
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	329 #endif
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	330
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	331 default:
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	332 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	333 "PROXY protocol v2 unsupported address family %ui",
7252 7bdab16c55f1 Core: style. Vladimir Homutov <vl@nginx.com> parents: 7251 diff changeset	334 family);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	335 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	336 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	337
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	338 pp->src_addr.data = ngx_pnalloc(c->pool, NGX_SOCKADDR_STRLEN);
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	339 if (pp->src_addr.data == NULL) {
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	340 return NULL;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	341 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	342
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	343 pp->src_addr.len = ngx_sock_ntop(&sockaddr.sockaddr, socklen,
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	344 pp->src_addr.data, NGX_SOCKADDR_STRLEN, 0);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	345
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	346 ngx_log_debug2(NGX_LOG_DEBUG_CORE, c->log, 0,
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	347 "PROXY protocol v2 address: %V %d", &pp->src_addr,
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	348 pp->src_port);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	349
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	350 if (buf < end) {
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	351 ngx_log_debug1(NGX_LOG_DEBUG_CORE, c->log, 0,
7253 63e91f263a49 Core: revised the PROXY protocol v2 code. Ruslan Ermilov <ru@nginx.com> parents: 7252 diff changeset	352 "PROXY protocol v2 %z bytes of tlv ignored", end - buf);
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	353 }
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	354
7590 06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	355 c->proxy_protocol = pp;
06b01840bd42 Core: moved PROXY protocol fields out of ngx_connection_t. Roman Arutyunyan <arut@nginx.com> parents: 7254 diff changeset	356
7251 416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	357 return end;
416953ef0428 Core: added processing of version 2 of the PROXY protocol. Vladimir Homutov <vl@nginx.com> parents: 6593 diff changeset	358 }

Mercurial > hg > nginx

annotate src/core/ngx_proxy_protocol.c @ 7590:06b01840bd42