1 This patch adds a kerberos authentication method to daemon mode.
3 NOTE: minimally munged to work with 3.1.1, but as yet untested!
5 To use this patch, run these commands for a successful build:
7 patch -p1 <patches/kerberos.diff
12 based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
13 diff --git a/Makefile.in b/Makefile.in
16 @@ -45,7 +45,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
17 util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
18 OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
19 usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
20 -OBJS3=progress.o pipe.o @ASM@
21 +OBJS3=progress.o pipe.o gss-auth.o @ASM@
22 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
23 popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
24 popt/popthelp.o popt/poptparse.o
25 diff --git a/clientserver.c b/clientserver.c
28 @@ -140,7 +140,7 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
32 - ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv);
33 + ret = start_inband_exchange(fd, fd, user, host, remote_argc, remote_argv);
35 return ret ? ret : client_run(fd, fd, -1, argc, argv);
37 @@ -217,7 +217,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
41 -int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char *argv[])
42 +int start_inband_exchange(int f_in, int f_out, const char *user, const char *host, int argc, char *argv[])
45 char line[BIGPATHBUFLEN];
46 @@ -328,6 +328,17 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
50 + if (strcmp(line, "@RSYNCD: GSS") == 0) {
52 + if (auth_gss_client(f_out, host) < 0)
56 + rprintf(FERROR, "GSSAPI is not supported\n");
61 if (strcmp(line,"@RSYNCD: OK") == 0)
64 @@ -719,7 +730,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
67 read_only = lp_read_only(i); /* may also be overridden by auth_server() */
68 - auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
70 + if (lp_use_gssapi(i))
71 + auth_user = auth_gss_server(f_in, f_out, i, host, addr, "@RSYNCD: GSS");
74 + auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
77 io_printf(f_out, "@ERROR: auth failed on module %s\n", name);
78 diff --git a/configure.ac b/configure.ac
81 @@ -938,6 +938,31 @@ if test x"$enable_iconv" != x"no"; then
82 AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.])
85 +AC_ARG_WITH([gssapi],
86 + [AS_HELP_STRING([--with-gssapi],
87 + [support GSSAPI authentication @<:@default=check@:>@])],
89 + [with_gssapi=check])
91 +AH_TEMPLATE([GSSAPI_OPTION],
92 +[Define if you want GSSAPI authentication. Specifing a value will set the search path.])
94 +AS_IF([test "x$with_gssapi" != xno],
95 + [AC_SEARCH_LIBS([gss_import_name], gss gssapi_krb5 ,
96 + [AC_CHECK_HEADERS(gssapi/gssapi_generic.h gssapi/gssapi.h) ]
97 + [ AC_DEFINE([GSSAPI_OPTION], [1]) ]
99 + [if test "x$with_gssapi" = xcheck; then
101 + [--with-gssapi was given, but test for function failed])
106 +if test x"$enable_gssapi" != x"no"; then
107 + AC_DEFINE(GSSAPI_OPTION, 1)
110 AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[
111 AC_RUN_IFELSE([AC_LANG_SOURCE([[
113 diff --git a/daemon-parm.txt b/daemon-parm.txt
114 --- a/daemon-parm.txt
115 +++ b/daemon-parm.txt
116 @@ -61,6 +61,7 @@ BOOL reverse_lookup True
117 BOOL strict_modes True
118 BOOL transfer_logging False
120 +BOOL use_gssapi False
121 BOOL write_only False
123 BOOL3 munge_symlinks Unset
124 diff --git a/gss-auth.c b/gss-auth.c
130 + * GSSAPI authentication.
132 + * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
133 + * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
134 + * Copyright (C) 2002-2008 Wayne Davison
136 + * This program is free software; you can redistribute it and/or modify
137 + * it under the terms of the GNU General Public License as published by
138 + * the Free Software Foundation; either version 3 of the License, or
139 + * (at your option) any later version.
141 + * This program is distributed in the hope that it will be useful,
142 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
143 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
144 + * GNU General Public License for more details.
146 + * You should have received a copy of the GNU General Public License along
147 + * with this program; if not, visit the http://fsf.org website.
152 +#ifdef GSSAPI_OPTION
154 +#define RSYNC_GSS_SERVICE "host"
156 +struct init_context_data {
157 + gss_cred_id_t initiator_cred_handle;
158 + gss_ctx_id_t *context_handle;
159 + gss_name_t target_name;
161 + OM_uint32 req_flags;
162 + OM_uint32 time_req;
163 + gss_channel_bindings_t input_chan_bindings;
164 + gss_OID *actual_mech_type;
165 + OM_uint32 *ret_flags;
166 + OM_uint32 *time_rec;
169 +struct accept_context_data {
170 + gss_ctx_id_t *context_handle;
171 + gss_cred_id_t acceptor_cred_handle;
172 + gss_channel_bindings_t input_chan_bindings;
173 + gss_name_t *src_name;
174 + gss_OID *mech_type;
175 + OM_uint32 *ret_flags;
176 + OM_uint32 *time_rec;
177 + gss_cred_id_t *delegated_cred_handle;
180 +int auth_gss_client(int fd, const char *host)
182 + gss_ctx_id_t ctxt = GSS_C_NO_CONTEXT;
183 + gss_name_t target_name = GSS_C_NO_NAME;
184 + struct init_context_data cb_data;
187 + OM_uint32 min_stat;
189 + buffer = new_array(char, (strlen(host) + 2 + strlen(RSYNC_GSS_SERVICE)));
191 + sprintf(buffer, "%s@%s", RSYNC_GSS_SERVICE, host);
193 + import_gss_name(&target_name, buffer, GSS_C_NT_HOSTBASED_SERVICE);
196 + cb_data.initiator_cred_handle = GSS_C_NO_CREDENTIAL;
197 + cb_data.context_handle = &ctxt;
198 + cb_data.target_name = target_name;
199 + cb_data.mech_type = GSS_C_NO_OID;
200 + cb_data.req_flags = GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG;
201 + cb_data.time_req = 0;
202 + cb_data.input_chan_bindings = GSS_C_NO_CHANNEL_BINDINGS;
203 + cb_data.actual_mech_type = NULL;
204 + cb_data.ret_flags = NULL;
205 + cb_data.time_rec = NULL;
207 + status = do_gss_dialog(fd, fd, 0, &cb_init_sec_context, (void *)&cb_data);
208 + if (ctxt != GSS_C_NO_CONTEXT)
209 + gss_delete_sec_context(&min_stat, &ctxt, GSS_C_NO_BUFFER);
210 + free_gss_name(&target_name);
216 + * The call back function for a gss_init_sec_context dialog
218 +OM_uint32 cb_init_sec_context(OM_uint32 *min_statp, gss_buffer_t in_token, gss_buffer_t out_token, void *cb_data)
220 + struct init_context_data *context_data;
222 + context_data = (struct init_context_data *) cb_data;
223 + return gss_init_sec_context(min_statp, context_data->initiator_cred_handle, context_data->context_handle, context_data->target_name, context_data->mech_type, context_data->req_flags, context_data->time_req, context_data->input_chan_bindings, in_token, context_data->actual_mech_type, out_token, context_data->ret_flags, context_data->time_rec);
226 +/* Possibly negotiate authentication with the client. Use "leader" to
227 + * start off the auth if necessary.
229 + * Return NULL if authentication failed. Return "" if anonymous access.
230 + * Otherwise return username.
232 +char *auth_gss_server(int fd_in, int fd_out, int module, const char *host, const char *addr, const char *leader)
234 + struct accept_context_data cb_data;
235 + gss_cred_id_t server_creds = GSS_C_NO_CREDENTIAL;
236 + gss_ctx_id_t context = GSS_C_NO_CONTEXT;
237 + OM_uint32 ret_flags;
238 + char *users = lp_auth_users(module);
239 + OM_uint32 maj_stat, min_stat;
240 + gss_name_t server_name = GSS_C_NO_NAME;
241 + gss_name_t client_name = GSS_C_NO_NAME;
242 + gss_OID doid = GSS_C_NO_OID;
245 + /* if no auth list then allow anyone in! */
246 + if (!users || !*users)
249 + import_gss_name(&server_name, "host", GSS_C_NT_HOSTBASED_SERVICE);
251 + maj_stat = gss_acquire_cred(&min_stat, server_name, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, GSS_C_ACCEPT, &server_creds, NULL, NULL);
252 + if (maj_stat != GSS_S_COMPLETE) {
253 + error_gss(maj_stat, min_stat, "error acquiring credentials on module %s from %s (%s)", lp_name(module), host, addr);
257 + io_printf(fd_out, "%s\n", leader);
259 + cb_data.context_handle = &context;
260 + cb_data.acceptor_cred_handle = server_creds;
261 + cb_data.input_chan_bindings = GSS_C_NO_CHANNEL_BINDINGS;
262 + cb_data.src_name = &client_name;
263 + cb_data.mech_type = &doid;
264 + cb_data.ret_flags = &ret_flags;
265 + cb_data.time_rec = NULL;
266 + cb_data.delegated_cred_handle = NULL;
268 + if (do_gss_dialog(fd_in, fd_out, -1, &cb_accept_sec_context, (void *)&cb_data) < 0)
271 + user = get_cn(client_name, doid);
273 + free_gss_name(&server_name);
274 + free_gss_name(&client_name);
280 + * The call back function for a gss_accept_sec_context dialog
282 +OM_uint32 cb_accept_sec_context(OM_uint32 *min_statp, gss_buffer_t in_token, gss_buffer_t out_token, void *cb_data)
284 + struct accept_context_data *context_data;
286 + context_data = (struct accept_context_data *) cb_data;
287 + return gss_accept_sec_context(min_statp, context_data->context_handle, context_data->acceptor_cred_handle, in_token, context_data->input_chan_bindings, context_data->src_name, context_data->mech_type, out_token, context_data->ret_flags, context_data->time_rec, context_data->delegated_cred_handle);
290 +void free_gss_buffer(gss_buffer_t gss_buffer)
292 + OM_uint32 maj_stat, min_stat;
294 + if (gss_buffer->length > 0) {
295 + maj_stat = gss_release_buffer(&min_stat, gss_buffer);
296 + if (maj_stat != GSS_S_COMPLETE) {
297 + error_gss(maj_stat, min_stat, "can't release a buffer");
302 +void free_gss_name(gss_name_t *gss_buffer)
304 + OM_uint32 maj_stat, min_stat;
306 + if (*gss_buffer != GSS_C_NO_NAME) {
307 + maj_stat = gss_release_name(&min_stat, gss_buffer);
308 + if (maj_stat != GSS_S_COMPLETE) {
309 + error_gss(maj_stat, min_stat, "can't release a name");
314 +void import_gss_name(gss_name_t *gss_name, const char *name, gss_OID type)
316 + gss_buffer_desc gssname;
317 + OM_uint32 maj_stat, min_stat;
319 + gssname.value = strdup(name);
320 + gssname.length = strlen(name) +1 ;
322 + maj_stat = gss_import_name(&min_stat, &gssname, type, gss_name);
324 + if (maj_stat != GSS_S_COMPLETE)
325 + error_gss(maj_stat, min_stat, "can't resolve %s", name);
327 + free_gss_buffer(&gssname);
330 +char *export_name(const gss_name_t input_name)
332 + OM_uint32 maj_stat, min_stat;
333 + gss_buffer_desc exported_name;
339 + maj_stat = gss_display_name(&min_stat, input_name, &exported_name, &name_oid);
340 + if (maj_stat != GSS_S_COMPLETE) {
341 + error_gss(maj_stat, min_stat, "can't get display name");
345 + if (exported_name.length > 0)
346 + exported = strdup(exported_name.value);
348 + free_gss_buffer(&exported_name);
353 +void error_gss(OM_uint32 major, OM_uint32 minor, const char *format, ...)
355 + OM_uint32 min_stat;
356 + gss_buffer_desc gss_msg = GSS_C_EMPTY_BUFFER;
359 + char message[BIGPATHBUFLEN];
361 + va_start(ap, format);
362 + vsnprintf(message, sizeof message, format, ap);
366 + if (major != GSS_S_FAILURE) /* Don't print unspecified failure, the message is useless */
368 + gss_display_status(&min_stat, major, GSS_C_GSS_CODE, GSS_C_NULL_OID, &msg_ctx, &gss_msg);
369 + rprintf(FERROR, "GSS-API error: %s: %s\n", message, (char *) gss_msg.value);
370 + free_gss_buffer(&gss_msg);
371 + } while (msg_ctx != 0);
375 + gss_display_status(&min_stat, minor, GSS_C_MECH_CODE, GSS_C_NULL_OID, &msg_ctx, &gss_msg);
376 + rprintf(FERROR, "GSS-API error: %s: %s\n",message, (char *) gss_msg.value);
377 + free_gss_buffer(&gss_msg);
378 + } while (msg_ctx != 0);
383 + * This function manage a gss dialog
384 + * gss tokens are eaten by a call-back function and then send by this function.
385 + * Argument to this function can be passed throught the cb_data argument
386 + * When told to act as a server, it just begin to wait for a first token before beginning operation
389 +int do_gss_dialog(int fd_in, int fd_out, int isServer, OM_uint32 (*eat_token)(OM_uint32 *,gss_buffer_t, gss_buffer_t, void *), void *cb_data)
391 + OM_uint32 maj_stat, min_stat;
392 + gss_buffer_desc in_token = GSS_C_EMPTY_BUFFER;
393 + gss_buffer_desc out_token = GSS_C_EMPTY_BUFFER;
396 + recv_gss_token(fd_in, &in_token);
399 + maj_stat = (*eat_token)(&min_stat, &in_token, &out_token, cb_data);
400 + free_gss_buffer(&in_token);
401 + if (maj_stat != GSS_S_COMPLETE
402 + && maj_stat != GSS_S_CONTINUE_NEEDED) {
403 + error_gss(maj_stat, min_stat, "error during dialog");
407 + if (out_token.length != 0) {
408 + send_gss_token(fd_out, &out_token);
410 + free_gss_buffer(&out_token);
412 + if (maj_stat == GSS_S_CONTINUE_NEEDED) {
413 + recv_gss_token(fd_in, &in_token);
415 + } while (maj_stat == GSS_S_CONTINUE_NEEDED);
420 +char *get_cn(const gss_name_t input_name, const gss_OID mech_type)
422 + OM_uint32 maj_stat, min_stat;
423 + gss_name_t output_name;
424 + gss_buffer_desc exported_name;
428 + maj_stat = gss_canonicalize_name(&min_stat, input_name, mech_type, &output_name);
429 + if (maj_stat != GSS_S_COMPLETE) {
430 + error_gss(maj_stat, min_stat, "canonizing name");
434 + maj_stat = gss_export_name(&min_stat, output_name, &exported_name);
435 + if (maj_stat != GSS_S_COMPLETE) {
436 + error_gss(maj_stat, min_stat, "canonizing name");
439 + if (exported_name.length > 0)
440 + cn = strdup(exported_name.value);
442 + free_gss_name(&output_name);
443 + free_gss_buffer(&exported_name);
448 +void send_gss_token(int fd, gss_buffer_t token)
450 + write_int(fd, token->length);
451 + write_buf(fd, token->value, token->length);
454 +void recv_gss_token(int fd, gss_buffer_t token)
456 + token->length = read_int(fd);
457 + if (token->length > 0) {
458 + token->value = new_array(char, token->length);
459 + read_buf(fd, token->value, token->length);
462 +#endif /* GSSAPI_OPTION */
463 diff --git a/main.c b/main.c
466 @@ -1573,7 +1573,7 @@ static int start_client(int argc, char *argv[])
467 * remote shell command, we need to do the RSYNCD protocol first */
468 if (daemon_connection) {
470 - tmpret = start_inband_exchange(f_in, f_out, shell_user, remote_argc, remote_argv);
471 + tmpret = start_inband_exchange(f_in, f_out, shell_user, shell_machine, remote_argc, remote_argv);
475 diff --git a/rsync.h b/rsync.h
478 @@ -534,6 +534,15 @@ enum delret {
482 +#ifdef GSSAPI_OPTION
483 +#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
484 +#include <gssapi/gssapi_generic.h>
486 +#ifdef HAVE_GSSAPI_GSSAPI_H
487 +#include <gssapi/gssapi.h>
493 #include "lib/pool_alloc.h"