diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1b86185..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/kissy diff --git a/Makefile b/Makefile deleted file mode 100644 index b3fbc1e..0000000 --- a/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -CC := gcc -CFLAGS := -O2 -pipe -Wall -Wextra -INSTALL := install -PREFIX := /usr/local -BINDIR := bin - -.PHONY: all -all: kissy - -kissy: kissy.c - $(CC) $(CFLAGS) -o kissy kissy.c - -.PHONY: install -install: - $(INSTALL) -Dm2755 -oroot -gtty -s kissy $(DESTDIR)$(PREFIX)/$(BINDIR)/kissy - -.PHONY: clean -clean: - rm -f kissy diff --git a/README.md b/README.md index a052f0d..8de72d9 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,9 @@ Ever wanted to kiss girls through a tty? Well now you can! ### Installation: - download kissy from the releases page and place it in the system's path -- run `sudo chown root:tty /path/to/kissy` (or whatever ownership it's supposed to have) +- run `sudo chown :tty /path/to/kissy` (or whatever group it's supposed to be) - run `sudo chmod 2755 /path/to/kissy` (or whatever permissions work for you. has to run with setgid) -- alternatively, build kissy from source using `make` then `sudo make install` - ### Usage: `kissy [target] ` @@ -20,4 +18,4 @@ Have fun girlkissing! :3 ## License -This project is licensed with [GPLv3](https://www.gnu.org/licenses/gpl-3.0.txt) +This project is licensed with [GPLv3](https://www.gnu.org/licenses/gpl-3.0.txt) \ No newline at end of file diff --git a/kissy.c b/kissy.c index 87f5cd7..9d67a1e 100644 --- a/kissy.c +++ b/kissy.c @@ -1,4 +1,4 @@ -// KISSY (Kissing Interface for Sapphic Smooching over ttY) v1.2 +// KISSY (Kissing Interface for Sapphic Smooching over ttY) v1.0 /* Copyright (C) 2025 Magdalunaa @@ -17,6 +17,17 @@ along with this program. If not, see . */ +/* +This file needs to: +- be owned by the tty group (or whatever group owns the terminal devices in your system) +- have setgid set +- be group executable +- not be world writeable + +You can probably just use 2755 permissions. those work + +*/ + #include #include #include @@ -24,37 +35,32 @@ #include #include #include -#include -#include // mreowww meow nya :3 int main (int argc, char **argv) { - - // print help - if (argc < 2 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0) { - printf("%s\n", "Usage: kissy [target] \n\n" - "Kissy is a utility that allows you to kiss currently logged in users who allow messages.\n" - "It works by writing to files in /dev/pts. It needs to run as the group who owns said files (usually tty), using setgid (2755 permissions)."); - return 0; - } - // are we running with setgid? struct stat stat_self; stat("/proc/self/exe", &stat_self); if (!(stat_self.st_mode & S_ISGID && !(stat_self.st_mode & S_IWOTH))) { - printf("%s\n", "setgid is not set, or this file is world writable."); + printf("%s\n", "setgid is not set, or this file is world writeable."); return 3; } + // check we have at least one argument + if (argc < 2) { + printf("%s\n", "Not enough arguments!\nUsage: kissy [target] "); + return 0; + } + // try to find the target's uid struct passwd *pw = getpwnam(argv[1]); if (pw == NULL) { printf("%s\n", "Cannot find target"); return 1; } - uid_t target = pw->pw_uid; + int target = pw->pw_uid; // get current username struct passwd *pw2 = getpwuid(getuid()); @@ -65,26 +71,17 @@ int main (int argc, char **argv) { char* user = pw2->pw_name; // if we have a second argument, set a custom kiss message - char kiss[32] = "*mwah*"; - if (argc >= 3) { - int len = strlen(argv[2]); - int written_chars = 0; - for (int i = 0; i < len; i++) { - if (written_chars >= 31) { - kiss[31] = '\0'; - break; - }; - if (iscntrl(argv[2][i])) continue; - kiss[i] = argv[2][i]; - written_chars++; - } - } - - bool kissed = false; + char* kiss; + if (argc >= 3) + kiss = argv[2]; + else + kiss = "*mwah*"; + + short kissed = 0; // iterate over all files in directory DIR *dir = opendir("/dev/pts"); while (1) { - struct dirent *ent = readdir(dir); + struct dirent *ent = readdir (dir); if (ent == NULL) break; @@ -97,13 +94,13 @@ int main (int argc, char **argv) { // find all terminals with the correct user and that are group-writable if (stats.st_mode & S_IWGRP && stats.st_uid == target) { - kissed = true; + kissed = 1; if (stats.st_gid != getegid()) { // are we running as the tty user? - fprintf(stderr, "%s\n", "Mismatch between file owner group and current effective group. Make sure this program is running with setgid."); + printf("%s\n", "Mismatch between file owner group and current effective group. Make sure this program is running with setgid."); } else { FILE *tty = fopen(filepath, "a"); // write to terminal! - fprintf(tty, "\a\n%s\n--%s\n", kiss, user); + fprintf(tty, "\n%s\n--%s\n", kiss, user); fclose(tty); } } @@ -111,5 +108,5 @@ int main (int argc, char **argv) { // print a message if a suitable terminal couldn't be found if (!kissed) - fprintf(stderr, "%s\n", "Couldn't find any suitable terminals. User is not logged in or has not enabled messages."); -} + printf("%s\n", "Couldn't find any suitable terminals. User is not logged in or has not enabled messages."); +} \ No newline at end of file