/*
- * $Id: auth.c,v 1.66 2009-10-02 09:32:40 franklahm Exp $
+ * $Id: auth.c,v 1.71 2009-11-30 15:30:47 franklahm Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "status.h"
#include "fork.h"
#include "extattrs.h"
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
#include "acls.h"
#endif
* These numbers are scattered throughout the code.
*/
static struct afp_versions afp_versions[] = {
+#ifndef NO_DDP
{ "AFPVersion 1.1", 11 },
{ "AFPVersion 2.0", 20 },
{ "AFPVersion 2.1", 21 },
+#endif /* ! NO_DDP */
{ "AFP2.2", 22 },
#ifdef AFP3x
{ "AFPX03", 30 },
{ "AFP3.1", 31 },
{ "AFP3.2", 32 }
-#endif
+#endif /* AFP3x */
};
static struct uam_mod uam_modules = {NULL, NULL, &uam_modules, &uam_modules};
static struct uam_obj *afp_uam = NULL;
-void status_versions( data )
- char *data;
+void status_versions( char *data, const ASP asp, const DSI *dsi)
{
char *start = data;
u_int16_t status;
- int len, num, i;
+ int len, num, i, count = 0;
memcpy(&status, start + AFPSTATUS_VERSOFF, sizeof(status));
num = sizeof( afp_versions ) / sizeof( afp_versions[ 0 ] );
+
+ for ( i = 0; i < num; i++ ) {
+#ifndef NO_DDP
+ if ( !asp && (afp_versions[ i ].av_number <= 21)) continue;
+#endif /* ! NO_DDP */
+ if ( !dsi && (afp_versions[ i ].av_number >= 22)) continue;
+ count++;
+ }
data += ntohs( status );
- *data++ = num;
+ *data++ = count;
+
for ( i = 0; i < num; i++ ) {
+#ifndef NO_DDP
+ if ( !asp && (afp_versions[ i ].av_number <= 21)) continue;
+#endif /* ! NO_DDP */
+ if ( !dsi && (afp_versions[ i ].av_number >= 22)) continue;
len = strlen( afp_versions[ i ].av_name );
*data++ = len;
memcpy( data, afp_versions[ i ].av_name , len );
return AFP_OK;
}
-static int afp_errpwdexpired(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf _U_, *rbuf _U_;
- int ibuflen _U_, *rbuflen;
+static int afp_errpwdexpired(AFPObj *obj _U_, char *ibuf _U_, size_t ibuflen _U_,
+ char *rbuf _U_, size_t *rbuflen)
{
*rbuflen = 0;
return AFPERR_PWDEXPR;
}
-static int afp_null_nolog(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf _U_, *rbuf _U_;
- int ibuflen _U_, *rbuflen;
+static int afp_null_nolog(AFPObj *obj _U_, char *ibuf _U_, size_t ibuflen _U_,
+ char *rbuf _U_, size_t *rbuflen)
{
*rbuflen = 0;
return( AFPERR_NOOP );
afp_switch = postauth_switch;
switch (afp_version) {
case 32:
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
uam_afpserver_action(AFP_GETACL, UAM_AFPSERVER_POSTAUTH, afp_getacl, NULL);
uam_afpserver_action(AFP_SETACL, UAM_AFPSERVER_POSTAUTH, afp_setacl, NULL);
uam_afpserver_action(AFP_ACCESS, UAM_AFPSERVER_POSTAUTH, afp_access, NULL);
-#endif
+#endif /* HAVE_ACLS */
uam_afpserver_action(AFP_GETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_getextattr, NULL);
uam_afpserver_action(AFP_SETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_setextattr, NULL);
uam_afpserver_action(AFP_REMOVEATTR, UAM_AFPSERVER_POSTAUTH, afp_remextattr, NULL);
}
#endif /* TRU64 */
- /* There's probably a better way to do this, but for now, we just
- play root */
+ if (ngroups > 0) {
+ #define GROUPSTR_BUFSIZE 1024
+ char groupsstr[GROUPSTR_BUFSIZE];
+ char *s = groupsstr;
+ int j = GROUPSTR_BUFSIZE;
+
+ int n = snprintf(groupsstr, GROUPSTR_BUFSIZE, "%u", groups[0]);
+ j -= n;
+ s += n;
+
+ for (int i = 1; i < ngroups; i++) {
+ n = snprintf(s, j, ", %u", groups[i]);
+ if (n == j) {
+ /* Buffer full */
+ LOG(log_debug, logtype_afpd, "login: group string buffer overflow");
+ break;
+ }
+ j -= n;
+ s += n;
+ }
+ LOG(log_debug, logtype_afpd, "login: %u supplementary groups: %s", ngroups, groupsstr);
+ }
+ /* There's probably a better way to do this, but for now, we just play root */
#ifdef ADMIN_GRP
- if (admin) uuid = 0;
+ if (admin)
+ uuid = 0;
else
#endif /* ADMIN_GRP */
uuid = pwd->pw_uid;
set_auth_switch(expired);
-
+ /* save our euid, we need it for preexec_close */
+ obj->uid = geteuid();
obj->logout = logout;
#ifdef FORCE_UIDGID
}
/* ---------------------- */
-int afp_zzz (obj, ibuf, ibuflen, rbuf, rbuflen ) /* Function 122 */
- AFPObj *obj;
- char *ibuf _U_, *rbuf;
- unsigned int ibuflen _U_, *rbuflen;
+int afp_zzz ( /* Function 122 */
+ AFPObj *obj,
+ char *ibuf _U_, size_t ibuflen _U_,
+ char *rbuf, size_t *rbuflen)
{
u_int32_t retdata;
/* ---------------------- */
-int afp_getsession(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- unsigned int ibuflen, *rbuflen;
+int afp_getsession(
+ AFPObj *obj,
+ char *ibuf, size_t ibuflen,
+ char *rbuf, size_t *rbuflen)
{
u_int16_t type;
u_int32_t idlen = 0;
*rbuflen = 0;
tklen = 0;
+ if (ibuflen < 2 + sizeof(type)) {
+ return AFPERR_PARAM;
+ }
+
ibuf += 2;
ibuflen -= 2;
}
/* ---------------------- */
-int afp_disconnect(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf, *rbuf _U_;
- int ibuflen _U_, *rbuflen;
+int afp_disconnect(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
{
u_int16_t type;
}
/* ---------------------- */
-static int get_version(obj, ibuf, ibuflen, len)
- AFPObj *obj;
- char *ibuf;
- int ibuflen;
- int len;
+static int get_version(AFPObj *obj, char *ibuf, size_t ibuflen, size_t len)
{
int num,i;
}
/* ---------------------- */
-int afp_login(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+int afp_login(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
struct passwd *pwd = NULL;
- int len, i;
+ size_t len;
+ int i;
*rbuflen = 0;
if ( nologin & 1)
return send_reply(obj, AFPERR_SHUTDOWN );
- if (ibuflen <= 1)
+ if (ibuflen < 2)
return send_reply(obj, AFPERR_BADVERS );
ibuf++;
if (i)
return send_reply(obj, i );
+ if (ibuflen <= len)
+ return send_reply(obj, AFPERR_BADUAM);
+
ibuf += len;
ibuflen -= len;
- if (ibuflen <= 1)
- return send_reply(obj, AFPERR_BADUAM);
-
len = (unsigned char) *ibuf++;
ibuflen--;
}
/* ---------------------- */
-int afp_login_ext(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- unsigned int ibuflen, *rbuflen;
+int afp_login_ext(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
struct passwd *pwd = NULL;
- unsigned int len;
+ size_t len;
int i;
char type;
u_int16_t len16;
if ( nologin & 1)
return send_reply(obj, AFPERR_SHUTDOWN );
- if (ibuflen <= 4)
+ if (ibuflen < 5)
return send_reply(obj, AFPERR_BADVERS );
ibuf++;
if (i)
return send_reply(obj, i );
+ if (ibuflen <= len)
+ return send_reply(obj, AFPERR_BADUAM);
+
ibuf += len;
ibuflen -= len;
- if (ibuflen <= 1)
- return send_reply(obj, AFPERR_BADUAM);
-
len = (unsigned char) *ibuf;
ibuf++;
ibuflen--;
return send_reply(obj, AFPERR_BADUAM);
}
/* user name */
- if (len <= 1 +sizeof(len16))
+ if (ibuflen <= 1 +sizeof(len16))
return send_reply(obj, AFPERR_PARAM);
type = *ibuf;
username = ibuf;
}
/* ---------------------- */
-int afp_logincont(obj, ibuf, ibuflen, rbuf, rbuflen)
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+int afp_logincont(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
struct passwd *pwd = NULL;
int err;
- if ( afp_uam == NULL || afp_uam->u.uam_login.logincont == NULL ) {
+ if ( afp_uam == NULL || afp_uam->u.uam_login.logincont == NULL || ibuflen < 2 ) {
*rbuflen = 0;
return send_reply(obj, AFPERR_NOTAUTH );
}
}
-int afp_logout(obj, ibuf, ibuflen, rbuf, rbuflen)
- AFPObj *obj;
- char *ibuf _U_, *rbuf _U_;
- int ibuflen _U_, *rbuflen _U_;
+int afp_logout(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen _U_)
{
LOG(log_info, logtype_afpd, "logout %s", obj->username);
close_all_vol();
* to work. this also does a little pre-processing before it hands
* it off to the uam.
*/
-int afp_changepw(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+int afp_changepw(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
char username[MACFILELEN + 1], *start = ibuf;
struct uam_obj *uam;
return AFPERR_PARAM;
/* send it off to the uam. we really don't use ibuflen right now. */
+ if (ibuflen < (size_t)(ibuf - start))
+ return AFPERR_PARAM;
+
ibuflen -= (ibuf - start);
ret = uam->u.uam_changepw(obj, username, pwd, ibuf, ibuflen,
rbuf, rbuflen);
/* FPGetUserInfo */
-int afp_getuserinfo(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf, *rbuf;
- int ibuflen _U_, *rbuflen;
+int afp_getuserinfo(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
{
u_int8_t thisuser;
u_int32_t id;
*rbuflen += sizeof(id);
}
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
if (bitmap & USERIBIT_UUID) {
int ret;
- uuid_t uuid;
+ atalk_uuid_t uuid;
char *uuidstring;
if ( ! (obj->options.flags & OPTION_UUID))
rbuf += UUID_BINSIZE;
*rbuflen += UUID_BINSIZE;
}
-#endif
+#endif /* HAVE_ACLS */
LOG(log_debug, logtype_afpd, "END afp_getuserinfo:");
return AFP_OK;
}
/* get rid of all of the uams */
-void auth_unload()
+void auth_unload(void)
{
struct uam_mod *mod, *prev, *start = &uam_modules;