*/
#include "sysdep.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <syslog.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-#include <string.h>
-#include <limits.h>
#include <libcitadel.h>
-#include "auth.h"
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "room_ops.h"
-#include "file_ops.h"
+
#include "control.h"
-#include "msgbase.h"
-#include "config.h"
+#include "support.h"
#include "citserver.h"
-#include "citadel_dirs.h"
-#include "genstamp.h"
-#include "threads.h"
#include "citadel_ldap.h"
-#include "context.h"
#include "ctdl_module.h"
#include "user_ops.h"
#include "internet_addressing.h"
int chkpwd_read_pipe[2];
-
-/*
- * getuser() - retrieve named user into supplied buffer.
- * returns 0 on success
- */
-int getuser(struct ctdluser *usbuf, char name[])
-{
- return CtdlGetUser(usbuf, name);
-}
-
-
/*
* CtdlGetUser() - retrieve named user into supplied buffer.
* returns 0 on success
return CtdlGetUserLen(usbuf, name, cutuserkey(name));
}
+int CtdlLockGetCurrentUser(void)
+{
+ CitContext *CCC = CC;
+
+ return CtdlGetUserLen(&CCC->user, CCC->curr_user, cutuserkey(CCC->curr_user));
+}
/*
* CtdlGetUserLock() - same as getuser() but locks the record
}
-/*
- * lgetuser() - same as getuser() but locks the record
- */
-int lgetuser(struct ctdluser *usbuf, char *name)
-{
- return CtdlGetUserLock(usbuf, name);
-}
-
-
/*
* CtdlPutUser() - write user buffer into the correct place on disk
*/
}
-
-/*
- * putuser() - write user buffer into the correct place on disk
- */
-void putuser(struct ctdluser *usbuf)
+void CtdlPutCurrentUserLock()
{
- CtdlPutUser(usbuf);
+ CtdlPutUser(&CC->user);
}
}
-/*
- * lputuser() - same as putuser() but locks the record
- */
-void lputuser(struct ctdluser *usbuf)
-{
- CtdlPutUserLock(usbuf);
-}
-
/*
* rename_user() - this is tricky because the user's display name is the database key
return(0);
}
+/*
+ * Convenience function.
+ */
+int CtdlAccessCheck(int required_level)
+{
+ if (CC->internal_pgm) return(0);
+ if (required_level >= ac_internal) {
+ cprintf("%d This is not a user-level command.\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
+ return(-1);
+ }
+
+ if ((required_level >= ac_logged_in_or_guest) && (CC->logged_in == 0) && (!config.c_guest_logins)) {
+ cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
+ return(-1);
+ }
+
+ if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) {
+ cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
+ return(-1);
+ }
+
+ if (CC->user.axlevel >= AxAideU) return(0);
+ if (required_level >= ac_aide) {
+ cprintf("%d This command requires Admin access.\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
+ return(-1);
+ }
+
+ if (is_room_aide()) return(0);
+ if (required_level >= ac_room_aide) {
+ cprintf("%d This command requires Admin or Room Admin access.\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
+ return(-1);
+ }
+
+ /* shhh ... succeed quietly */
+ return(0);
+}
+
+
/*
* Is the user currently logged in an Admin?
return(r);
}
-/*
- * getuserbynumber() - get user by number
- * returns 0 if user was found
- *
- * Note: fetching a user this way requires one additional database operation.
- */
-int getuserbynumber(struct ctdluser *usbuf, long number)
-{
- return CtdlGetUserByNumber(usbuf, number);
-}
-
-
-
/*
* Helper function for rebuild_usersbynumber()
*/
/* If a "master user" is defined, handle its authentication if specified */
CC->is_master = 0;
- if (strlen(config.c_master_user) > 0) if (strlen(config.c_master_pass) > 0) if (authname) {
- if (!strcasecmp(authname, config.c_master_user)) {
- CC->is_master = 1;
- }
+ if ((configlen.c_master_user > 0) &&
+ (configlen.c_master_pass > 0) &&
+ (authname != NULL) &&
+ (!strcasecmp(authname, config.c_master_user)))
+ {
+ CC->is_master = 1;
}
/* Continue attempting user validation... */
else {
/* native auth mode */
- struct recptypes *valid = NULL;
+ recptypes *valid = NULL;
/* First, try to log in as if the supplied name is a display name */
found_user = CtdlGetUser(&CC->user, username);
PerformSessionHooks(EVT_LOGIN);
/* Enter the lobby */
- CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL);
+ CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL, NULL, NULL);
}
CCC->curr_user, CCC->cs_pid
);
- /*
- * If there is a download in progress, abort it.
- */
- if (CCC->download_fp != NULL) {
- fclose(CCC->download_fp);
- CCC->download_fp = NULL;
- }
-
- /*
- * If there is an upload in progress, abort it.
- */
- if (CCC->upload_fp != NULL) {
- abort_upl(CCC);
- }
-
/* Run any hooks registered by modules... */
PerformSessionHooks(EVT_LOGOUT);
CtdlPutUserLock(&CC->user);
/* Return to the Lobby, so we don't end up in an undefined room */
- CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL);
+ CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL, NULL, NULL);
return(0);
}