*/
#include <afsconfig.h>
-#if defined(UKERNEL)
-#include "afs/param.h"
-#else
#include <afs/param.h>
-#endif
-RCSID
- ("$Header$");
-
-#if defined(UKERNEL)
-#include "afs/sysincludes.h"
-#include "afs_usrops.h"
-#include "afsincludes.h"
-#include "afs/stds.h"
-#include "rx/rx.h"
-#include "rx/xdr.h"
-#include "rx/rxkad.h"
-#include "afs/auth.h"
-#include "afs/cellconfig.h"
-#include "afs/afsutil.h"
-#include "afs/ptclient.h"
-#include "afs/ptuser.h"
-#include "afs/pterror.h"
-#else /* defined(UKERNEL) */
#include <afs/stds.h>
#include <ctype.h>
#include <sys/types.h>
#include <netinet/in.h>
#endif
#include <stdio.h>
-#ifdef HAVE_STRING_H
#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
#include <rx/rx.h>
#include <rx/xdr.h>
-#include <rx/rxkad.h>
#include <afs/auth.h>
#include <afs/cellconfig.h>
#include <afs/afsutil.h>
+#include <afs/com_err.h>
+#include <errno.h>
#include "ptclient.h"
#include "ptuser.h"
#include "pterror.h"
-#endif /* defined(UKERNEL) */
+#ifdef UKERNEL
+# include "afs_usrops.h"
+#endif
struct ubik_client *pruclient = 0;
static afs_int32 lastLevel; /* security level pruclient, if any */
static char *whoami = "libprot";
+
+#define ID_HASH_SIZE 1024
+#define ID_STACK_SIZE 1024
+
+/**
+ * Hash table chain of user and group ids.
+ */
+struct idchain {
+ struct idchain *next;
+ afs_int32 id;
+};
+
+/**
+ * Hash table of user and group ids.
+ */
+struct idhash {
+ afs_uint32 userEntries; /**< number of user id entries hashed */
+ afs_uint32 groupEntries; /**< number of group id entries hashed */
+ struct idchain *hash[ID_HASH_SIZE];
+};
+
+/**
+ * Allocate a new id hash table.
+ */
+static afs_int32
+AllocateIdHash(struct idhash **aidhash)
+{
+ struct idhash *idhash;
+
+ idhash = (struct idhash *)malloc(sizeof(struct idhash));
+ if (!idhash) {
+ return ENOMEM;
+ }
+ memset((void *)idhash, 0, sizeof(struct idhash));
+ *aidhash = idhash;
+ return 0;
+}
+
+/**
+ * Free the id hash.
+ */
+static void
+FreeIdHash(struct idhash *idhash)
+{
+ int index;
+ struct idchain *chain;
+ struct idchain *next;
+
+ for (index = 0; index < ID_HASH_SIZE; index++) {
+ for (chain = idhash->hash[index]; chain; chain = next) {
+ next = chain->next;
+ free(chain);
+ }
+ }
+ free(idhash);
+}
+
+/**
+ * Indicate if group/user id is already hashed, and
+ * if not insert it.
+ *
+ * @returns whether id is present
+ * @retval >0 id is already present in the hash
+ * @retval 0 id was not found and was inserted into the hash
+ * @retval <0 error encountered
+ */
+static afs_int32
+FindId(struct idhash *idhash, afs_int32 id)
+{
+ afs_int32 index;
+ struct idchain *chain;
+ struct idchain *newChain;
+
+ index = abs(id) % ID_HASH_SIZE;
+ for (chain = idhash->hash[index]; chain; chain = chain->next) {
+ if (chain->id == id) {
+ return 1;
+ }
+ }
+
+ /* Insert this id but return not found. */
+ newChain = (struct idchain *)malloc(sizeof(struct idchain));
+ if (!newChain) {
+ return ENOMEM;
+ } else {
+ newChain->id = id;
+ newChain->next = idhash->hash[index];
+ idhash->hash[index] = newChain;
+ if (id < 0) {
+ idhash->groupEntries++;
+ } else {
+ idhash->userEntries++;
+ }
+ }
+ return 0;
+}
+
+/**
+ * Create an idlist from the ids in the hash.
+ */
+static afs_int32
+CreateIdList(struct idhash *idhash, idlist * alist, afs_int32 select)
+{
+ struct idchain *chain;
+ afs_int32 entries = 0;
+ int index;
+ int i;
+
+ if (select & PRGROUPS) {
+ entries += idhash->groupEntries;
+ }
+ if (select & PRUSERS) {
+ entries += idhash->userEntries;
+ }
+
+ alist->idlist_len = entries;
+ alist->idlist_val = (afs_int32 *) malloc(sizeof(afs_int32) * entries);
+ if (!alist->idlist_val) {
+ return ENOMEM;
+ }
+
+ for (i = 0, index = 0; index < ID_HASH_SIZE; index++) {
+ for (chain = idhash->hash[index]; chain; chain = chain->next) {
+ if (chain->id < 0) {
+ if (select & PRGROUPS) {
+ alist->idlist_val[i++] = chain->id;
+ }
+ } else {
+ if (select & PRUSERS) {
+ alist->idlist_val[i++] = chain->id;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
afs_int32
pr_Initialize(IN afs_int32 secLevel, IN const char *confDir, IN char *cell)
{
afs_int32 code;
struct rx_connection *serverconns[MAXSERVERS];
- struct rx_securityClass *sc[3];
- static struct afsconf_dir *tdir = (struct afsconf_dir *)0; /* only do this once */
+ struct rx_securityClass *sc = NULL;
+ static struct afsconf_dir *tdir = (struct afsconf_dir *)NULL; /* only do this once */
static char tconfDir[100] = "";
static char tcell[64] = "";
- struct ktc_token ttoken;
afs_int32 scIndex;
+ afs_int32 secFlags;
static struct afsconf_cell info;
afs_int32 i;
+#if !defined(UKERNEL)
char cellstr[64];
+#endif
afs_int32 gottdir = 0;
afs_int32 refresh = 0;
if (!tdir) {
if (confDir && strcmp(confDir, ""))
fprintf(stderr,
- "libprot: Could not open configuration directory: %s.\n",
- confDir);
+ "%s: Could not open configuration directory: %s.\n",
+ whoami, confDir);
else
fprintf(stderr,
- "libprot: No configuration directory specified.\n");
+ "%s: No configuration directory specified.\n",
+ whoami);
return -1;
}
gottdir = 1;
}
#endif /* defined(UKERNEL) */
- if (tdir == 0 || strcmp(confDir, tconfDir) || strcmp(cell, tcell)) {
+ if (tdir == NULL || strcmp(confDir, tconfDir) || strcmp(cell, tcell)) {
/*
* force re-evaluation. we either don't have an afsconf_dir,
* the directory has changed or the cell has changed.
*/
if (tdir && !gottdir) {
afsconf_Close(tdir);
- tdir = (struct afsconf_dir *)0;
+ tdir = (struct afsconf_dir *)NULL;
}
- pruclient = (struct ubik_client *)0;
+ pruclient = (struct ubik_client *)NULL;
refresh = 1;
}
* want, don't get a new one. Unless the security level is 2 in
* which case we will get one (and re-read the key file).
*/
- if (pruclient && (lastLevel == secLevel) && (secLevel != 2))
+ if (pruclient && (lastLevel == secLevel) && (secLevel != 2)) {
return 0;
+ }
code = rx_Init(0);
if (code) {
return code;
}
- scIndex = secLevel;
- sc[0] = 0;
- sc[1] = 0;
- sc[2] = 0;
/* Most callers use secLevel==1, however, the fileserver uses secLevel==2
* to force use of the KeyFile. secLevel == 0 implies -noauth was
* specified. */
- if ((secLevel == 2) && (afsconf_GetLatestKey(tdir, 0, 0) == 0)) {
- /* If secLevel is two assume we're on a file server and use
- * ClientAuthSecure if possible. */
- code = afsconf_ClientAuthSecure(tdir, &sc[2], &scIndex);
- if (code)
- fprintf(stderr,
- "libprot: clientauthsecure returns %d %s"
- " (so trying noauth)\n", code, error_message(code));
- if (code)
- scIndex = 0; /* use noauth */
- if (scIndex != 2)
- /* if there was a problem, an unauthenticated conn is returned */
- sc[scIndex] = sc[2];
+ if (secLevel == 2) {
+ code = afsconf_GetLatestKey(tdir, 0, 0);
+ if (code) {
+ afs_com_err(whoami, code, "(getting key from local KeyFile)\n");
+ } else {
+ /* If secLevel is two assume we're on a file server and use
+ * ClientAuthSecure if possible. */
+ code = afsconf_ClientAuthSecure(tdir, &sc, &scIndex);
+ if (code)
+ afs_com_err(whoami, code, "(calling client secure)\n");
+ }
} else if (secLevel > 0) {
- struct ktc_principal sname;
- strcpy(sname.cell, info.name);
- sname.instance[0] = 0;
- strcpy(sname.name, "afs");
- code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
- if (code)
- scIndex = 0;
- else {
- if (ttoken.kvno >= 0 && ttoken.kvno <= 256)
- /* this is a kerberos ticket, set scIndex accordingly */
- scIndex = 2;
- else {
- fprintf(stderr,
- "libprot: funny kvno (%d) in ticket, proceeding\n",
- ttoken.kvno);
- scIndex = 2;
- }
- sc[2] =
- rxkad_NewClientSecurityObject(rxkad_clear, &ttoken.sessionKey,
- ttoken.kvno, ttoken.ticketLen,
- ttoken.ticket);
+ secFlags = 0;
+ if (secLevel > 1)
+ secFlags |= AFSCONF_SECOPTS_ALWAYSENCRYPT;
+
+ code = afsconf_ClientAuthToken(&info, secFlags, &sc, &scIndex, NULL);
+ if (code) {
+ afs_com_err(whoami, code, "(getting token)");
+ if (secLevel > 1)
+ return code;
}
}
- if (scIndex == 1)
- return PRBADARG;
- if ((scIndex == 0) && (sc[0] == 0))
- sc[0] = rxnull_NewClientSecurityObject();
- if ((scIndex == 0) && (secLevel != 0))
- com_err(whoami, code,
- "Could not get afs tokens, running unauthenticated.");
+
+ if (sc == NULL) {
+ sc = rxnull_NewClientSecurityObject();
+ scIndex = RX_SECIDX_NULL;
+ }
+
+ if ((scIndex == RX_SECIDX_NULL) && (secLevel != 0))
+ fprintf(stderr,
+ "%s: Could not get afs tokens, running unauthenticated\n",
+ whoami);
memset(serverconns, 0, sizeof(serverconns)); /* terminate list!!! */
for (i = 0; i < info.numServers; i++)
serverconns[i] =
rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
- info.hostAddr[i].sin_port, PRSRV, sc[scIndex],
+ info.hostAddr[i].sin_port, PRSRV, sc,
scIndex);
code = ubik_ClientInit(serverconns, &pruclient);
if (code) {
- com_err(whoami, code, "ubik client init failed.");
+ afs_com_err(whoami, code, "ubik client init failed.");
return code;
}
lastLevel = scIndex;
- code = rxs_Release(sc[scIndex]);
+ code = rxs_Release(sc);
return code;
}
int
-pr_End()
+pr_End(void)
{
int code = 0;
idlist lids;
lnames.namelist_len = 2;
- lnames.namelist_val = (prname *) malloc(2 * PR_MAXNAMELEN);
+ lnames.namelist_val = malloc(2 * PR_MAXNAMELEN);
strncpy(lnames.namelist_val[0], user, PR_MAXNAMELEN);
strncpy(lnames.namelist_val[1], group, PR_MAXNAMELEN);
lids.idlist_val = 0;
done:
if (lnames.namelist_val)
free(lnames.namelist_val);
- if (lids.idlist_val)
- free(lids.idlist_val);
+
+ xdr_free((xdrproc_t) xdr_idlist, &lids);
return code;
}
idlist lids;
lnames.namelist_len = 2;
- lnames.namelist_val = (prname *) malloc(2 * PR_MAXNAMELEN);
+ lnames.namelist_val = malloc(2 * PR_MAXNAMELEN);
strncpy(lnames.namelist_val[0], user, PR_MAXNAMELEN);
strncpy(lnames.namelist_val[1], group, PR_MAXNAMELEN);
lids.idlist_val = 0;
done:
if (lnames.namelist_val)
free(lnames.namelist_val);
- if (lids.idlist_val)
- free(lids.idlist_val);
- return code;
+ xdr_free((xdrproc_t) xdr_idlist, &lids);
+
+ return code;
}
int
lids.idlist_len = 0;
lids.idlist_val = 0;
lnames.namelist_len = 1;
- lnames.namelist_val = (prname *) malloc(PR_MAXNAMELEN);
+ lnames.namelist_val = malloc(PR_MAXNAMELEN);
stolower(name);
strncpy(lnames.namelist_val[0], name, PR_MAXNAMELEN);
code = ubik_PR_NameToID(pruclient, 0, &lnames, &lids);
if (lids.idlist_val) {
*id = *lids.idlist_val;
- free(lids.idlist_val);
+ xdr_free((xdrproc_t) xdr_idlist, &lids);
}
if (lnames.namelist_val)
free(lnames.namelist_val);
register afs_int32 code;
lids.idlist_len = 1;
- lids.idlist_val = (afs_int32 *) malloc(sizeof(afs_int32));
+ lids.idlist_val = malloc(sizeof(afs_int32));
*lids.idlist_val = id;
lnames.namelist_len = 0;
lnames.namelist_val = 0;
code = ubik_PR_IDToName(pruclient, 0, &lids, &lnames);
- if (lnames.namelist_val) {
+
+ if (lnames.namelist_val)
strncpy(name, lnames.namelist_val[0], PR_MAXNAMELEN);
- free(lnames.namelist_val);
- }
+
if (lids.idlist_val)
free(lids.idlist_val);
+
+ xdr_free((xdrproc_t) xdr_namelist, &lnames);
+
return code;
}
oid);
*moreP = 0;
}
- lids = (idlist *) & alist;
+ lids = (idlist *) &alist;
code = pr_IdToName(lids, lnames);
+
+ xdr_free((xdrproc_t) xdr_prlist, &alist);
+
if (code)
return code;
- if (alist.prlist_val)
- free(alist.prlist_val);
+
return PRSUCCESS;
}
fprintf(stderr, "membership list for id %d exceeds display limit\n",
gid);
}
- lids = (idlist *) & alist;
+ lids = (idlist *) &alist;
code = pr_IdToName(lids, lnames);
+
+ xdr_free((xdrproc_t) xdr_prlist, &alist);
+
if (code)
return code;
- if (alist.prlist_val)
- free(alist.prlist_val);
return PRSUCCESS;
}
int
+pr_IDListExpandedMembers(afs_int32 aid, namelist * lnames)
+{
+ afs_int32 code;
+ afs_int32 gid;
+ idlist lids;
+ prlist alist;
+ afs_int32 over;
+ struct idhash *members = NULL;
+ afs_int32 *stack = NULL;
+ afs_int32 maxstack = ID_STACK_SIZE;
+ int n = 0; /* number of ids stacked */
+ int i;
+ int firstpass = 1;
+
+ code = AllocateIdHash(&members);
+ if (code) {
+ return code;
+ }
+ stack = (afs_int32 *) malloc(sizeof(afs_int32) * maxstack);
+ if (!stack) {
+ code = ENOMEM;
+ goto done;
+ }
+
+ stack[n++] = aid;
+ while (n) {
+ gid = stack[--n]; /* pop next group id */
+ alist.prlist_len = 0;
+ alist.prlist_val = NULL;
+ if (firstpass || aid < 0) {
+ firstpass = 0;
+ code = ubik_PR_ListElements(pruclient, 0, gid, &alist, &over);
+ } else {
+ code = ubik_PR_ListSuperGroups(pruclient, 0, gid, &alist, &over);
+ if (code == RXGEN_OPCODE) {
+ alist.prlist_len = 0;
+ alist.prlist_val = NULL;
+ code = 0; /* server does not support supergroups. */
+ }
+ }
+ if (code)
+ goto done;
+ if (over) {
+ fprintf(stderr,
+ "membership list for id %d exceeds display limit\n", gid);
+ }
+ for (i = 0; i < alist.prlist_len; i++) {
+ afs_int32 found;
+ afs_int32 id;
+
+ id = alist.prlist_val[i];
+ found = FindId(members, id);
+ if (found < 0) {
+ code = found;
+ xdr_free((xdrproc_t) xdr_prlist, &alist);
+ goto done;
+ }
+ if (found == 0 && id < 0) {
+ if (n == maxstack) { /* need more stack space */
+ afs_int32 *tmp;
+ maxstack += n;
+ tmp =
+ (afs_int32 *) realloc(stack,
+ maxstack * sizeof(afs_int32));
+ if (!tmp) {
+ code = ENOMEM;
+ xdr_free((xdrproc_t) xdr_prlist, &alist);
+ goto done;
+ }
+ stack = tmp;
+ }
+ stack[n++] = id; /* push group id */
+ }
+ }
+ xdr_free((xdrproc_t) xdr_prlist, &alist);
+ }
+
+ code = CreateIdList(members, &lids, (aid < 0 ? PRUSERS : PRGROUPS));
+ if (code) {
+ goto done;
+ }
+ code = pr_IdToName(&lids, lnames);
+ if (lids.idlist_len)
+ free(lids.idlist_val);
+
+ done:
+ if (stack)
+ free(stack);
+ if (members)
+ FreeIdHash(members);
+ return code;
+}
+
+int
pr_ListEntry(afs_int32 id, struct prcheckentry *aentry)
{
register afs_int32 code;
if (*id == ANONYMOUSID)
return PRNOENT;
code = ubik_PR_ListEntry(pruclient, 0, *id, &aentry);
- //code = ubik_PR_ListEntry(pruclient, 0, *id, &aentry);
if (code)
return code;
/* this should be done in one RPC, but I'm lazy. */
if (oid == ANONYMOUSID)
return PRNOENT;
}
- code = ubik_PR_ChangeEntry(pruclient, 0, id, newname, oid, newid);
+ if (newid)
+ code = ubik_PR_ChangeEntry(pruclient, 0, id, newname, oid, *newid);
+ else
+ code = ubik_PR_ChangeEntry(pruclient, 0, id, newname, oid, 0);
return code;
}
stolower(uname);
stolower(gname);
lnames.namelist_len = 2;
- lnames.namelist_val = (prname *) malloc(2 * PR_MAXNAMELEN);
+ lnames.namelist_val = malloc(2 * PR_MAXNAMELEN);
strncpy(lnames.namelist_val[0], uname, PR_MAXNAMELEN);
strncpy(lnames.namelist_val[1], gname, PR_MAXNAMELEN);
lids.idlist_val = 0;
if (code) {
if (lnames.namelist_val)
free(lnames.namelist_val);
- if (lids.idlist_val)
- free(lids.idlist_val);
+ xdr_free((xdrproc_t) xdr_idlist, &lids);
return code;
}
code =
lids.idlist_val[1], flag);
if (lnames.namelist_val)
free(lnames.namelist_val);
- if (lids.idlist_val)
- free(lids.idlist_val);
+ xdr_free((xdrproc_t) xdr_idlist, &lids);
return code;
}
nusers, 0, 0);
return code;
}
+
+int
+pr_ListSuperGroups(afs_int32 gid, namelist * lnames)
+{
+ afs_int32 code;
+ prlist alist;
+ idlist *lids;
+ afs_int32 over;
+
+ alist.prlist_len = 0;
+ alist.prlist_val = 0;
+ code = ubik_PR_ListSuperGroups(pruclient, 0, gid, &alist, &over);
+ if (code)
+ return code;
+ if (over) {
+ fprintf(stderr, "supergroup list for id %d exceeds display limit\n",
+ gid);
+ }
+ lids = (idlist *) & alist;
+ code = pr_IdToName(lids, lnames);
+
+ xdr_free((xdrproc_t) xdr_prlist, &alist);
+ return code;
+}