kayprish/timeoutd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: kayprish:for-divegeek
Branches Tags
kayprish:1.5
kayprish:master
kayprish:for-divegeek
..
compare: kayprish:1.5
Branches Tags
kayprish:1.5
kayprish:master
kayprish:for-divegeek

45 commits
for-divege ... 1.5

Author SHA1 Message Date
Petar Kapris
90a3d933a7 Reformat one line 2021-01-05 19:58:12 +01:00
Petar Kapris
99c35a4572 Remove unnecessary function declaration 2021-01-03 21:07:21 +01:00
Petar Kapris
69f002acd2 Add minor stylistic changes 2021-01-03 20:40:51 +01:00
Petar Kapris
2a47637d5e Remove unnecessary headers 2021-01-03 17:33:07 +01:00
Petar Kapris
007c2d3ccf Rewrite process existence check for readability 2021-01-03 17:04:39 +01:00
Petar Kapris
097a93441b Removed last use of /proc 
In the last several commits, all uses of the /proc virtual file system
have been removed, intentionally in some places, unintentionally in
others. Now I've finished that job, hopefully this will make it easier
to port the program on systems which don't support procfs by default,
such as FreeBSD and OpenBSD.
 2021-01-02 21:00:35 +01:00
Petar Kapris
5469d5ec00 Remove getusr function 
This function was only used to check if the special case for ssh ended
up properly, since it's not a special case anymore, the function isn't
called anywhere, and has been removed.
 2021-01-02 20:54:17 +01:00
Petar Kapris
42731b5ced Remove chk_ssh 
Because the behavior of the function doesn't change at all depending on
whether a utmp entry is over ssh or not, the function which checks this
is not needed, and has been removed.
 2021-01-02 20:16:47 +01:00
Petar Kapris
696a3973f1 Remove getcpid 
This function is used to get the child of the current login process of a
user connected over ssh. However, it's actually completely unnecessary,
as the login process, given in the utmp file, is all we need, yes, it's
owned by root, but the daemon should be owned by root as well, so we can
simply hang-up the login process, the exact same way we would do to a
normal terminal session, the other users of sshd will not be affected.
 2020-12-31 22:03:18 +01:00
Petar Kapris
256a972787 Remove getdisc function completely 
The function getdisc doesn't seem to serve any purpose when it comes to
checking user idle time, by the time it's called, the part of check_idle
which checks access time to the terminal will have already finished, and
there is no reason that a check for idle time on a terminal should act
any differently based on the line discipline. Since the function serves
no purpose, and the call and check of it's result seems like it only
introduces a potential bug, and has no reason to be there, the function
has been removed, as well as the code in chk_timeout which calls it.

NOTE: at this point, the function didn't even check the line discipline,
i gutted it so it would only return the constant N_TTY, i was planning
on rewriting the function to get the terminal line discipline in a more
portable way, since the original way wasn't, but ultimately decided it
didn't even need to exist in the first place.
 2020-12-28 23:39:40 +01:00
Petar Kapris
f5f7cf8153 Remove unused ctime declaration 2020-12-28 23:38:39 +01:00
Petar Kapris
a0af8075ce Remove some unnecessary comments 2020-12-28 23:36:20 +01:00
Petar Kapris
be15d1fc76 Replace tty variable in chk_timeout 
The tty variable is a char pointer equal to dev, it's pointee does not
change during the function, nor does the pointer itself change, it's
always simply equal to the argument dev, therefore, this pointer is, ...
pointless (ba dum tss!)
 2020-12-20 11:47:16 +01:00
Petar Kapris
9201509738 Replace ACTIVE cpp constant with ALLOWED 
ACTIVE is a bit of a misnomer here, when what the constant is meant to
represent is whether the user is allowed to login, or contiue being
logged in, so it's been replaced with a more appropriate name.
 2020-12-20 11:47:16 +01:00
Petar Kapris
8077ae6004 Replace pstat variable in check_idle 2020-12-19 09:58:27 +01:00
Petar Kapris
e680e16ff8 Remove config check for user in check_idle 
At the beginning of the check_idle function, the username in the utmp
entry currently being checked is used to loop through the config file
and check if the user is mentioned in the config line at all. This is
completely unnecessary, as the needed check is done later anyways when
chk_timeout is called, it might give a slight performance boost to
prevent some of the xsession checks that happen before the chk_timeout
call, but slow code is probably better than repeating code.
 2020-12-18 19:09:35 +01:00
Petar Kapris
80e7839b97 Remove unused global variable errmsg 2020-12-18 16:19:39 +01:00
Petar Kapris
311fe03ec8 Print tty stat fail message to syslog 
In check_idle there is an sprintf call which copies an error message to
the global variable errmsg, after which, absolutely nothing was done
with the variable. From a piece of commented out code underneath, one
can tell that this line used to have a purpose, as it was used in a
bailout call, where it gets printed to the syslog. This call is deleted
and now the errmsg string is simply written to and then never used.

Now the line has been modified so the error message gets written to the
syslog, removing the need for the errmsg variable.
 2020-12-18 15:50:29 +01:00
Petar Kapris
a60ff18d3c Rearrange idle time checks in check_idle 2020-12-18 15:18:45 +01:00
Petar Kapris
fd6525652d Fix length of dev global variable 
Since the ut_line field is not guarranteed to be null terminated, in
order to get a proper null terminated string, dev is required to have an
extra byte at the end.
 2020-12-18 14:51:21 +01:00
Petar Kapris
dbf40dbc53 Remove already available strcasecmp function 2020-12-17 23:41:02 +01:00
Petar Kapris
f72a68acd9 Remove unneeded special case for config check 2020-12-17 23:40:06 +01:00
Petar Kapris
a0b03ac870 Fix length of user and host in check_idle() 
The username and hostname in a utmp entry is not guarranteed to be NUL
terminated. Specifically, if a user's name is exactly UT_NAMESIZE (32 on
most systems today), the last character will not in fact be NUL. This
creates a problem in the line 866 for example, where strncpy is used to
copy all but the last byte of the utmp username in user. This will cause
an error in the specific case where strlen(utmpp->ut_user) =
UT_NAMESIZE.

The solution is to simply make user and host one byte longer, thereby
letting them have a place for the terminating NUL, after this, they can
be treated as regular strings without any error or extra precaution.
 2020-12-17 23:40:06 +01:00
Petar Kapris
c272cf17db Fix utmp entry check in check_idle() 2020-12-17 23:40:06 +01:00
Petar Kapris
d8f6dd3b5e Replace SYSLOG_DEBUG constant with LOG_DEBUG 2020-12-17 23:40:06 +01:00
Petar Kapris
6b03dd0ebd Remove commented out code 2020-12-17 23:40:06 +01:00
Petar Kapris
ccac62f7e7 Remove more #ifdef portability hacks 2020-12-17 23:39:20 +01:00
Petar Kapris
608f4fb896 Remove unnecessary openlog() and closelog() calls 2020-12-17 12:28:25 +01:00
Petar Kapris
e6c8f1b6c1 Remove most platform-specific ifdef workarounds 
Since most of the #ifdef hacks are meant to facilitate the use of the
daemon under older versions of SunOS which didn't have many of the utmp
library functions and facilities most modern Unices have, and since they
significantly hamper the readability of the code, they have been
removed. For portabilities sake, further changes will have to be made
anyways, many modern systems, such as newer versions of FreeBSD, don't
support utmp anymore, and require use of utmpx instead. The program will
have to be changed accordingly.

The getdisc() function has been almost entirely stripped, and now is
just a stub that always returns N_TTY. This will have to be changed
quickly, so that the function returns the actual tty discipline, but
works in most cases.
 2020-12-16 23:20:09 +01:00
Petar Kapris
d1e322d12d Fix getrlimit call in main 2020-12-16 23:15:55 +01:00
Petar Kapris
16e428b36f Add exit statuses to new manpage section 2020-12-10 15:55:14 +01:00
Petar Kapris
6fc342929c Close all FD's instead of just 0,1,2 on startup 
Changed the startup in the main function to loop through all file
descriptors from getrlimit(RLIMIT_NOFILE) down to 0, and close them all
to make sure none are left opened by the parent process.
 2020-12-10 14:36:21 +01:00
Petar Kapris
27a087ac3d Add missing make dependency in `install' target 
The `install' target was missing the existence of a compiled executable
in the directory as a dependency, it's been added.
 2020-12-10 13:48:06 +01:00
Petar Kapris
06c238d486 Add error checks and fork() call after setsid() 
In order to start a daemon, a second call for fork() after changing
session ID is usually required, in order to prevent acquiring a
controlling tty when it eventually writes to one.
 2020-12-06 19:51:37 +01:00
Petar Kapris
e4c67052ef Change ut_list_p variable from global to local 
The variable ut_list_p, is used in two seperate functions, read_wtmp()
and free_wtmp(), it's state isn't preserved, nor is it important,
therefore it's cleaner to simply use two local variables in each
function, rather than one global variable, used across both.
 2020-11-25 19:04:56 +01:00
Petar Kapris
37f91bf330 Shorten length of array in config_ent to 4 
The string array *messages[] in the config_ent structure, which is used
to store configuration data during runtime, has been shortened to have 4
strings, rather than 10, this is due to the fact that it's only used
with indeces IDLEMSG, SESSMSG, DAYMSG and NOLOGINMSG, or a variable with
one of these as a value. These indeces are all symbolic constants with
values 0 through 3, so only 4 members in the array are needed.
 2020-11-25 17:44:05 +01:00
Petar Kapris
9869a3657d Remove unnecessary local refernce to time() 
At the start of the check_idle() function, there is an unnecessary local
declaration of time(2), which is already declared at the start of the
program. It has been removed.
 2020-11-25 17:20:58 +01:00
Petar Kapris
261b0c5084 Fix "no * expansion for USERS field in config" bug 
There were two lines in the check_idle() function, which were meant to
test if a given user has been found in a given line of the configuration
file. Rather than using the chkmatch function, to test for a match, and
any potential expansions, these two lines, comprising an if statement,
simply checked if the USER pattern matched the given username as a
string, or if it was simply a *.

This means that if a function was checking the user kappa, it would
match him for the USERS field "kappa" or "*", but not "ka*", this is not
the behaviour documented in the timeouts(5) manpage, which explicitly
states the expansion for the USERS field in the config, will be done in
the exact same way as the TTYS field.
 2020-11-25 11:29:17 +01:00
kappa
24e4896584 Fix alarm bell symbols 
There are three string literals in the code where rather than having the
usual \a escape sequence to represent an alert character, the literal
character was inserted, this makes it impractical to edit the lines in
most text editors. So they have been replaced with the more typical
escape sequence.
 2020-11-25 11:29:17 +01:00
kappa
1ed5ce8edf Change indentation style to modified K&R 
The entire source code of timeoutd.c has been passed through GNU indent,
in order to amend the inconsistencies, it uses the K&R C style, but
modified, so that tabs are replaced with 4 spaces, close to what a lot
of the code was already using. (Blasphemy, i know) Also the maximum line
length is 100 chars, apart from long strings, which don't get cut as a
result.
 2020-11-25 11:29:17 +01:00
kappa
848c784e7f Delete trailing whitespaces 
Several lines in the code either have whitespace where tabs are
expected, the converse, or trailing whitespace before a newline. All
of these have been removed or replaced.
 2020-11-25 11:29:11 +01:00
kappa
2bd4a73b56 Remove unneeded files: dump_wtmp.c and VERSION 
The file dump_wtmp.c is not a part of the timeoutd program itself, but a
seperate diagnostic tool, which, if it must be used at all, belongs in a
seperate package. I've decided to simply remove it from this repository.
It's name is also a misnomer, as it's programed to actually dump the
utmp file, not the wtmp file. It also only dumps records written on the
current date, and only some of the fields. It seemed that fixing the
program would require more effort that it's worth, as I'm currently not
using the program for any diagnostic purpose, and there are now better
replacements for it, such as the Linux package utmpdump. Therefore, I
decided to remove it and cease working on it.

The VERSION file didn't seem to be too useful, as the version of the
program is stated elsewhere, the VERSION file is actually out of date
with the version in the timeoutd.c file, and the particular version of
the software doesn't even matter currently.

Therefore, both files have been deleted.
 2020-11-25 11:28:58 +01:00
kappa
d03d713004 Clean up lines that cause warning messages in GCC 
There are several lines in the code which cause GCC to warn the user
about undefined behaviour. Most of these are potential buffer overflow
problems. Which come from either overwriting a buffer which may be too
small for a given input, or writing to, or from, a string not guaranteed
to be null-terminated, such as any of the char[] fields in a utmp
struct. Almost all come from an improper usage of strcmp or strncmp or
similar.
 2020-11-24 23:46:14 +01:00
Petar Kapris
dc23fca1ce Fix documentation errors and typos in README 
The README file mentions the wrong pathnames in its installation,
instructing the user to install the binary in "/usr/etc", rather than
the "/usr/sbin" directory, for example. It also has a typo at the very
end. These errors have been fixed.
 2020-11-24 21:58:09 +01:00
Petar Kapris
0bfd961a8c Completely rewrite broken Makefile 
The Makefile for the project was unable to properly build. It didn't
call an X11 library which was needed for the program to link, but called
various libraries which weren't necessary. It also didn't install the
/etc/timeouts config file, didn't have an uninstall option, and it's
install would fail, due to the fact that it used non-existent
directories as install destinations, and broken user and group settings
for the files.

All of the afformentioned problems have been mended in this commit. It's
likely that all of the problems which actually broke the program were
due to a difference in Unix systems of the early 90s compared to 2020.
It's likely the X11 libraries were reorganised, and the users and groups
in the install command have been obsoleted.
 2020-11-24 21:44:10 +01:00
14 changed files with 737 additions and 1248 deletions
Show stats Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +0,0 @@
timeoutd
*.o

27
Makefile
View file

@ -1,11 +1,22 @@
CFLAGS=-fomit-frame-pointer -O2 -s -g -Wall -Wno-unused-result CFLAGS = -g -Wall
timeoutd: timeoutd.c Makefile
#$(CC) $(CFLAGS) -o timeoutd timeoutd.c timeoutd: timeoutd.c
$(CC) $(CFLAGS) -o timeoutd.o -c timeoutd.c -DTIMEOUTDX11 $(CC) $(CFLAGS) -o timeoutd.o -c timeoutd.c -DTIMEOUTDX11
$(CC) $(CFLAGS) -o timeoutd -L/usr/X11R6/lib timeoutd.o -lXss -lXext -lX11 $(CC) $(CFLAGS) -o timeoutd timeoutd.o -lX11 -lXss
clean:
-rm -f timeoutd timeoutd.o
install: install: timeoutd /etc/timeouts
install -o root -g system -m 2111 timeoutd /usr/etc/timeoutd install timeoutd /usr/sbin/timeoutd
install -o man -g info -m 444 timeoutd.8 /usr/man/man8 install timeoutd.8 /usr/share/man/man8
install -o man -g info -m 444 timeouts.5 /usr/man/man5 install timeouts.5 /usr/share/man/man5
uninstall:
rm /usr/sbin/timeoutd
rm /usr/share/man/man8/timeoutd.8
rm /usr/share/man/man5/timeouts.5
rm /etc/timeouts
/etc/timeouts:
install timeouts /etc

8
README
View file

@ -14,18 +14,18 @@ your preferred compilation options, then simply:
make make
The next step is to install a timeouts file in /usr/etc specifying The next step is to install a timeouts file in /etc specifying
the parameters for each line/user/group combination. You can use the parameters for each line/user/group combination. You can use
the sample file provided in the distribution as a starting point the sample file provided in the distribution as a starting point
after reading the timeoutd.8 and timeouts.5 man pages. after reading the timeoutd.8 and timeouts.5 man pages.
Once you have installed the timeouts file in /usr/etc, you can type: Once you have installed the timeouts file in /etc, you can type:
make install make install
to install the timeoutd binaries and man pages. to install the timeoutd binaries and man pages.
Then it is just a matter of running /usr/etc/timeoutd. You may want Then it is just a matter of running /usr/sbin/timeoutd. You may want
to add a line to your /etc/rc or /etc/rc.local (or whatever) to run to add a line to your /etc/rc or /etc/rc.local (or whatever) to run
timeoutd at boot time. timeoutd at boot time.
@ -40,5 +40,5 @@ line in /etc/profile near the top of the file:
/usr/etc/timeoutd `whoami` `basename \`tty\`` || exit /usr/etc/timeoutd `whoami` `basename \`tty\`` || exit
Please sends bugs, comments, suggestions to: Please send bugs, comments, suggestions to:
shanea@bigpond.net.au (Shane Alderton) shanea@bigpond.net.au (Shane Alderton)

1
VERSION
View file

@ -1 +0,0 @@
1.5

7
debian/.gitignore vendored
View file

@ -1,7 +0,0 @@
files
timeoutd.debhelper.log
timeoutd.postinst.debhelper
timeoutd.postrm.debhelper
timeoutd.prerm.debhelper
timeoutd.substvars
timeoutd

14
debian/changelog vendored
View file

@ -1,11 +1,11 @@
timeoutd (1.5-10.2) unstable; urgency=low timeoutd (1.5-10.1ubuntu1~1.gbp45a983) UNRELEASED; urgency=low
* Non-maintainer upload
* Resolve the missing symbol XOpenDisplay by linking with libX11
* Update debian/control Standards-Version: 3.9.5
* Ignore files generated by building debian package
* Update debian/compat to version 5
-- Clark Rawlins <clark@bit63.org> Sun, 14 Dec 2014 09:28:59 -0800 ** SNAPSHOT build @45a9836343ec6efa904b51360713c52fb623d6d8 **
* UNRELEASED
* Fixed local X session handling
-- Shawn Willden <shawn@kahlan.willden.org> Sun, 04 Jan 2009 23:17:57 -0700
timeoutd (1.5-10.1) unstable; urgency=low timeoutd (1.5-10.1) unstable; urgency=low

2
debian/compat vendored
View file

@ -1 +1 @@
5 4

4
debian/control vendored
View file

@ -2,12 +2,12 @@ Source: timeoutd
Section: admin Section: admin
Priority: extra Priority: extra
Maintainer: Dennis Stampfer <seppy@debian.org> Maintainer: Dennis Stampfer <seppy@debian.org>
Standards-Version: 3.9.5 Standards-Version: 3.6.2
Build-Depends: debhelper (>= 4), libx11-dev, libxss-dev Build-Depends: debhelper (>= 4), libx11-dev, libxss-dev
Package: timeoutd Package: timeoutd
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}
Conflicts: suidmanager (<< 0.50) Conflicts: suidmanager (<< 0.50)
Description: Flexible user timeout daemon with X11 support Description: Flexible user timeout daemon with X11 support
timeoutd enforces the time restrictions specified for each or all users. timeoutd enforces the time restrictions specified for each or all users.

5
debian/rules vendored
View file

@ -4,9 +4,6 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
build-arch: build
build-indep: build
build: build:
$(MAKE) timeoutd $(MAKE) timeoutd
@ -23,7 +20,7 @@ clean:
install: build install: build
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_prep dh_clean -k
dh_installdirs dh_installdirs
# Add here commands to install the package into debian/<packagename> # Add here commands to install the package into debian/<packagename>

1
debian/source/format vendored
View file

@ -1 +0,0 @@
3.0 (git)

2
debian/timeoutd.init.d vendored
View file

@ -16,8 +16,6 @@ DESC="user timeout daemon"
test -x $DAEMON || exit 0 test -x $DAEMON || exit 0
. /lib/lsb/init-functions
set -e set -e
case "$1" in case "$1" in

68
dump_wtmp.c
View file

@ -1,68 +0,0 @@
#include <stdio.h>
#include <utmp.h>
#include <time.h>
main()
{
FILE *fp;
struct utmp ut;
struct tm *tm;
char user[9];
char host[17];
char line[13];
if ((fp = fopen(UTMP_FILE, "r")) == NULL)
{
printf("Could not open wtmp file!");
exit(1);
}
/* Go to end of file minus one structure */
fseek(fp, -1L * sizeof(struct utmp), SEEK_END);
while (fread(&ut, sizeof(struct utmp), 1, fp) == 1)
{
tm = localtime(&ut.ut_time);
/*
if (tm->tm_year != now.tm_year || tm->tm_yday != now.tm_yday)
break;
*/
printf("%02d:%02d type=", tm->tm_hour,tm->tm_min);
switch (ut.ut_type)
{
#ifndef SUNOS
case RUN_LVL: printf("RUN_LVL");
break;
case BOOT_TIME: printf("BOOT_TIME");
break;
case NEW_TIME: printf("NEW_TIME");
break;
case OLD_TIME: printf("OLD_TIME");
break;
case INIT_PROCESS: printf("INIT_PROCESS");
break;
case LOGIN_PROCESS: printf("LOGIN_PROCESS");
break;
case USER_PROCESS: printf("USER_PROCESS");
break;
case DEAD_PROCESS: printf("DEAD_PROCESS");
break;
#endif
default: printf("UNKNOWN!(type=%d)", ut.ut_type);
}
strncpy(user, ut.ut_user, 8);
user[8] = 0;
strncpy(host, ut.ut_host, 16);
host[16] = 0;
strncpy(line, ut.ut_line, 12);
line[12] = 0;
printf(" line=%s host=%s user=%s\n", line, host, user);
/* Position the file pointer 2 structures back */
if (fseek(fp, -2 * sizeof(struct utmp), SEEK_CUR) < 0) break;
}
fclose(fp);
}

10
timeoutd.8
View file

@ -54,7 +54,15 @@ to login at that time, or whether they have exceeded their daily time limit.
When invoked in this way, by passing a username and tty (without the leading When invoked in this way, by passing a username and tty (without the leading
/dev) on the command line, /dev) on the command line,
.B timeoutd .B timeoutd
returns one of the following exit codes: returns an exit code and may leave an appropriate message.
.SH EXIT STATUS
When run in daemon mode,
.B timeoutd
may exit with an exit status of 1, in case of fatal error, or 0, if it has been
terminated by another process.
.PP
When invoked as a normal command, it will exit
with one of the following exit codes:
.IP "0 User is allowed to login .IP "0 User is allowed to login
.IP "1 Fatal error .IP "1 Fatal error
.IP "5 Incorrect command line format .IP "5 Incorrect command line format

958
timeoutd.c
View file

File diff suppressed because it is too large Load diff