summaryrefslogtreecommitdiff
path: root/slock.c
AgeCommit message (Collapse)Author
2016-11-20move config.h inclusion after type declarationsMarkus Teich
2016-10-18Unboolify slock.cLaslo Hunhold
2016-10-10Use explicit strcmp() instead of inlining itFRIGN
Makes it a tad more readable; the previous "optimization" will be done by the compiler anyway.
2016-10-10No need for oldc to be staticFRIGN
2016-10-10Use NUL character constant explicitlyFRIGN
2016-10-10Keep the line-lengths at bayFRIGN
This makes the code more readable and prevents wraparounds in the editor.
2016-09-26remove confusing DPMS commentMarkus Teich
FRIGN on hackers@suckless.org: What has been bugging me for quite a while is this DPMS comment that was added there for no reason. Every sane mind would agree that fiddling with DPMS makes no sense whatsoever. When I slock, my screen turns off after 10 minutes. So, if I don't like that, I disable DPMS. If I do, I just fiddle around with my mouse a bit and get the slock promt.
2016-09-23error out early on crypt() failMarkus Teich
2016-09-23Stop using $USER for shadow entriesFRIGN
This was extremely bad practice, effectively making the program behave different depending on which architecture you are running it on. OpenBSD offers getpwuid_shadow, but there is no getspuid for getspnam, so we resort to using the pw_name entry in the struct passwd we filled earlier. This prevents slock from crashing when $USER is empty (easy to do). If you want to run slock as a different user, don't use $ USER="tom" slock but doas or sudo which were designed for this purpose.
2016-09-23Rename getpw() and pws to gethash() and hashFRIGN
2016-09-23Remove cleanup and deglobalize and rework data structuresFRIGN
The cleanup removal is a joint-venture with Markus. We assume the X server does the cleanup, so we don't need it. The idea is that the fds are closed at exit and thus already indicate to the X server that the client has quit. Analogously the same applies to freeing memory sections previously allocated for the X server. We love XXXXXL burgers and therefore removed XUngrabPointer XUngrabKeyboard XFreeColors XFreePixmap XDestroyWindow Lines of Code. For a project like slock there is no need to carry around global state. By moving the three structures to main() it is now clear which functions modify which state, greatly improving the readability of the code, especially given slock is a suid program.
2016-09-08Ensure Polyphemus-Mitigation and properly drop privilegesFRIGN
Don't hide privilege drops inside readpw() and actually make it configurable what you are dropping to in config.h. The privilege drop comes after opening the Display because the user "nobody" with "nogroup" can't do that. So why do I call this strategy the Polyphemus-Mitigation? """ After the giant returns in the evening and eats two more of the men, Odysseus offers Polyphemus some strong and undiluted wine given to him earlier on his journey. Drunk and unwary, the giant asks Odysseus his name, promising him a guest-gift if he answers. Odysseus tells him "Οὖτις", which means "nobody" and Polyphemus promises to eat this "Nobody" last of all. With that, he falls into a drunken sleep. Odysseus had meanwhile hardened a wooden stake in the fire and now drives it into Polyphemus' eye. When Polyphemus shouts for help from his fellow giants, saying that "Nobody" has hurt him, they think Polyphemus is being afflicted by divine power and recommend prayer as the answer. """ (source: https://en.wikipedia.org/wiki/Polyphemus)
2016-09-07Unify how we check passwords between different OSesQuentin Rameau
2016-09-07make error message prefix consistentMarkus Teich
2016-09-02increasing for loops are idiomaticMarkus Teich
2016-09-02Localize running and failure inside readpw()Quentin Rameau
They are only needed there, so don't make them global.
2016-09-02Move screen unlocking inside cleanup()Quentin Rameau
2016-09-02Re-introduce the waiting loop for input grabbingQuentin Rameau
We actually “need” to wait a little for input to be released before locking for cases where slock is spawned from other graphical applications using keybindings. This undoes the misbehaviour I introduced in c2f9757, sorry for the mess.
2016-09-02Add cleanup() to do free(locks) + XCloseDisplay()Quentin Rameau
2016-08-31Refactor dontkillme()FRIGN
- Use file pointers instead of raw I/O, inspired by Kernel code. - Use OOM_SCORE_ADJ_MIN from linux/oom.h instead of working with magic values. - Stricter error checking and descriptive error messages. The reasoning for using the constant rather than magic values lies in the fact that this ensures people get the message. With "-1000", a code reviewer would question if that is really the lowest possible number or just an arbitrary value. The kernel ABI probably won't change, but even in the case, we wouldn't have to modify the code. The OOM killer only is guaranteed to not kill you if you have OOM_SCORE_ADJ_MIN.
2016-08-31Convert manpage to mandoc and fix usageFRIGN
In all honor, the previous usage was formally more correct, but for the sake of consistency across all the tools having the v-flag, I separated it from the command-string. Also, make use of the mandoc macros for the manpage. This makes it easier to maintain, extend and change in the future.
2016-08-31fix CVE-2016-6866Markus Teich
2016-08-31Update bsd-auth string.Markus Teich
Thanks to Hiltjo for discovering this.
2016-08-30Exit as soon as possible on input grabbing errorQuentin Rameau
We want to know at once if slock failed or not to lock the screen, not seing a black screen for a whole second (or two) and then die. Thanks to ^7heo for reporting this.
2016-08-22Refactor main()FRIGN
- Add arg.h and fix usage Given slock is suid we don't want to have half-measures in place to parse the arguments in case the code is changed in the future with somebody not paying enough attention. Also, fix the usage string output to be more consistent across the suckless toolbase and make it reflect the manpage entry. - Comments Use proper block comments and add/change them where necessary to help in studying the code. - Error messages Consistently prepend them with "slock:" and fix wording and do a proper cleanup before quitting (XCloseDisplay and free the locks), making the die() semantics consistent with st's. - getpwuid() error reporting Properly present an error message if getpwuid() fails. - fork() error reporting Properly present an error message if fork() fails. If we cannot close the connection within the fork context we abort the operation and report an error. - execvp() error handling If execvp fails, we cannot call die() afterwards as this implies calling exit(). We must use _exit() to prevent the libc from doing now "illegal" cleanup-work.
2016-08-13clear passwords with explicit_bzeroHiltjo Posthuma
Make sure to explicitly clear memory that is used for password input. memset is often optimized out by the compiler. Brought to attention by the OpenBSD community, see: https://marc.info/?t=146989502600003&r=1&w=2 Thread subject: x11/slock: clear passwords with explicit_bzero Changes: - explicit_bzero.c import from libressl-portable. - Makefile: add COMPATSRC for compatibility src. - config.mk: add separate *BSD section in config.mk to simply uncomment it on these platforms.
2016-02-15Revert "No need for usage()"Markus Teich
This reverts most of commit a6dc051e3744ce5b14c54d2d246d3e8258207e76 and fixes some related stuff: - keep spelling fixes from original commit - make -h and -v also work when followed by more arguments - any unknown flag prints usage - fix output of -v to display "slock: version 1.3" instead of "slock: slock-1.3"
2016-02-15revert using argv0 and minor fixupMarkus Teich
- use hardcoded "slock" instead of argv[0] - add "slock: " to fprintf calls, where it was missing - revert `argc--, argv++` shifting
2016-02-14Use argv0 instead of passing "slock:" to die every timeFRIGN
2016-02-14No need for usage()FRIGN
There are 2 arguments why -v and -h are broken: 1) if you are running off git, -v will show the last stable release, effectively making this option useless. people running stable versions leave open an attack surface this way in case there are vulnerabilities found. 99% of the people are also using package managers to keep their software up to date, instead of running $TOOL -v to check how old it is. 2) -h is a sad excuse for not just looking at the manual page (man 1 slock). Given we accept a post_lock_command, we can't be as liberal and just intercept certain flags. I changed the manpage to reflect this change.
2016-02-14Simplify the oom-taming-functionFRIGN
There really is no need to source a defined variable from a linux header. The OOM-rank ranges from -1000 to 1000, so we can safely hardcode -1000, which is a sane thing to do given slock is suid and we don't want to play around too much here anyway. On another notice, let's not forget that this still is a shitty heuristic. The OOM-killer still can kill us (thus I also changed the wording in the error-message. We do not disable the OOM-killer, we're just hiding.
2016-02-11update copyright year in -v outputMarkus Teich
2016-01-29add hint for suid to oom error messageMarkus Teich
2016-01-18error messages on grab failureMarkus Teich
2016-01-18code style fixMarkus Teich
2015-12-26add option to run command after screen is lockedMarkus Teich
2015-08-27Don't change to failure colour on successDavid Phillips
2015-07-06Slightly safer OOM killer disablement in linuxDavid Phillips
2015-05-08rework setting window colorMarkus Teich
2015-05-08consistently use () with sizeofMarkus Teich
2015-05-08Option to not show failure color on clearNick Currier
2015-04-01resize lockscreen window after Xrandr resizeMarkus Teich
2015-04-01Blank the screen with color 0, add third color for failed loginsDavid Phillips
- Adds another color in config.def.h, COLOR_INIT - Renames the colours from numerical ones to ones with meaningful names; COLOR_INPUT for when there is content in the input buffer and COLOR_EMPTY for when the input buffer has been cleared (backspaced or a failed attempt). - Ensures XFreeColors frees the right number of colours. This is now derived from the size of `Lock->colors` rather than being an integer literal. - Makes slock exhibit the behaviour described by Markus The default colours are the same as the ones slock currently uses, with the exception of the new color, which I have set to red, as it indicates someone has either failed an attempt to unlock, or that they have entered input and erased it all.
2015-01-27applied Dimitris' style patch from Dec'14, with some minor modificationsAnselm R Garbe
2014-12-22fixed usage stringAnselm R Garbe
2014-12-22applied sin's patch and prepared new releaseAnselm R Garbe
2014-11-09end{pw,sp}ent() can only be called after get{pw,sp}ent()sin
Calling them unconditionally can result in memory corruption.
2014-07-09Only check errno if getpwuid() failssin
Checking errno otherwise is unspecified.
2014-06-09Add /etc/passwd supportFRIGN
Fix slock to work with /etc/passwd without /etc/shadow. while we're at it, remove an occurence of trailing whitespace.
2014-01-29Set errno to 0 before getpwuid() and check it afterwardssin
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 11:37:29 +0000