Skip to content

Commit 71d4f01

Browse files
Adding an sslmode parameter FRiCKLE#67
1 parent 7950a25 commit 71d4f01

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/ngx_postgres_module.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ typedef struct {
114114
ngx_str_t dbname;
115115
ngx_str_t user;
116116
ngx_str_t password;
117+
ngx_str_t sslmode;
117118
} ngx_postgres_upstream_server_t;
118119

119120
typedef struct {
@@ -125,6 +126,7 @@ typedef struct {
125126
ngx_str_t dbname;
126127
ngx_str_t user;
127128
ngx_str_t password;
129+
ngx_str_t sslmode;
128130
} ngx_postgres_upstream_peer_t;
129131

130132
typedef struct {

src/ngx_postgres_upstream.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ ngx_postgres_upstream_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *uscf)
9494
peers->peer[n].dbname = server[i].dbname;
9595
peers->peer[n].user = server[i].user;
9696
peers->peer[n].password = server[i].password;
97+
peers->peer[n].sslmode = server[i].sslmode;
9798

9899
peers->peer[n].host.data = ngx_pnalloc(cf->pool,
99100
NGX_SOCKADDR_STRLEN);
@@ -335,7 +336,7 @@ ngx_postgres_upstream_get_peer(ngx_peer_connection_t *pc, void *data)
335336
+ sizeof("dbname=") + peer->dbname.len
336337
+ sizeof("user=") + peer->user.len
337338
+ sizeof("password=") + peer->password.len
338-
+ sizeof("sslmode=disable");
339+
+ sizeof("sslmode=") + peer->sslmode.len;
339340

340341
connstring = ngx_pnalloc(pgdt->request->pool, len);
341342
if (connstring == NULL) {
@@ -350,9 +351,9 @@ ngx_postgres_upstream_get_peer(ngx_peer_connection_t *pc, void *data)
350351
/* TODO add unix sockets */
351352
last = ngx_snprintf(connstring, len - 1,
352353
"hostaddr=%V port=%d dbname=%V user=%V password=%V"
353-
" sslmode=disable",
354+
" sslmode=%V",
354355
&peer->host, peer->port, &peer->dbname, &peer->user,
355-
&peer->password);
356+
&peer->password, &peer->sslmode);
356357
*last = '\0';
357358

358359
dd("PostgreSQL connection string: %s", connstring);

0 commit comments

Comments
 (0)