Add formatter and pipe support

This commit is contained in:
xSlendiX 2021-09-08 01:07:21 +03:00
parent 27156191f1
commit 253e48af77
3 changed files with 242 additions and 214 deletions

14
.clang-format Normal file
View File

@ -0,0 +1,14 @@
---
Language: Cpp
BasedOnStyle: WebKit
SpaceAfterTemplateKeyword: false
AlignEscapedNewlines: true
AlignTrailingComments: true
BreakBeforeInheritanceComma: true
BreakConstructorInitializers: BeforeComma
IndentPPDirectives: AfterHash
BreakBeforeBraces: Custom
BraceWrapping:
AfterFunction: true
NamespaceIndentation: None

View File

@ -1,5 +1,5 @@
build:
cc -lcrypt -I. sus.c -o sus
cc -Wall -lcrypt -I. sus.c -o sus
all: build install

134
sus.c
View File

@ -9,31 +9,31 @@
#define _XOPEN_SOURCE
#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <shadow.h>
#include <sys/types.h>
#include <unistd.h>
#include <pwd.h>
#include <grp.h>
#include <shadow.h>
#include <errno.h>
#define MAX_PASSWORD 3
// TODO: Add pipe support
void get_password(char* password);
void get_password(char *password);
void cats(char **str, const char *str2);
void cats(char** str, const char* str2);
int CheckIfInGroup(const char* string);
int GetUID(const char* username, uid_t* uid);
void PrintHelp(); void CreatePasswordMessage();
void PrintHelp();
void CreatePasswordMessage();
int CheckPassword(char* password);
int AskPassword();
int uid = 0;
uid_t uid = 0;
int command_start = 1;
@ -41,23 +41,22 @@ char* command_name;
struct termios old_terminal;
void intHandler(int dummy) {
void getln(int, char*, size_t);
void intHandler(int dummy)
{
tcsetattr(STDIN_FILENO, TCSANOW, &old_terminal);
puts("Cancelled.");
exit(0);
}
int main(int argc, char** argv) {
struct rule *rule;
char **envp;
int main(int argc, char** argv)
{
if (CheckIfInGroup("wheel") != 1) {
puts("ERROR: Not in the wheel group.");
return 0;
}
tcgetattr(STDIN_FILENO, &old_terminal);
signal(SIGINT, intHandler);
command_name = malloc((1 + strlen(argv[0])) * sizeof(char));
@ -96,8 +95,7 @@ int main(int argc, char** argv) {
}
if (username[0] == '-')
memmove(username, username+1, strlen(username));
memmove(username, username + 1, strlen(username));
}
char* command = "";
@ -106,12 +104,11 @@ int main(int argc, char** argv) {
cats(&command, " ");
}
command[strlen(command)-1] = '\0';
command[strlen(command) - 1] = '\0';
if (username[0] == '\0')
uid = 0;
else
if (GetUID(username, &uid) == -1) {
else if (GetUID(username, &uid) == -1) {
printf("ERROR: Could not find username: %s", username);
return 1;
}
@ -124,17 +121,20 @@ int main(int argc, char** argv) {
return 0;
}
int GetUID(const char* username, uid_t* uid) { struct passwd *pw; pw = getpwnam(username); if (pw != NULL) { *uid = pw->pw_uid;
int GetUID(const char* username, uid_t* uid)
{
struct passwd* pw;
pw = getpwnam(username);
if (pw != NULL) {
*uid = pw->pw_uid;
return 1;
}
return -1;
}
int CheckIfInGroup(const char* string) {
int ngroups_max;
ngroups_max = sysconf(_SC_NGROUPS_MAX);
int CheckIfInGroup(const char* string)
{
int groups = getgroups(0, NULL);
gid_t list[groups];
@ -145,25 +145,22 @@ int CheckIfInGroup(const char* string) {
return -1;
for (int i = 0; i < groups; i++) {
struct group *grp;
struct group* grp;
grp = getgrgid(list[i]);
if (grp == NULL)
return -1;
if (strcmp(grp->gr_name, "wheel") == 0)
return 1;
}
return -1;
}
void PrintHelp() {
printf("Usage: %s [- user] command\n", command_name);
}
void PrintHelp() { printf("Usage: %s [- user] command\n", command_name); }
int AskPassword() {
for (int i=0; i<MAX_PASSWORD; i++) {
printf("Password: ");
int AskPassword()
{
for (int i = 0; i < MAX_PASSWORD; i++) {
char password[BUFSIZ];
get_password(password);
@ -172,12 +169,16 @@ int AskPassword() {
return 1;
else
CreatePasswordMessage();
sleep(1);
}
return 0;
}
int CheckPassword(char* password) {
int CheckPassword(char* password)
{
struct spwd* shadow_entry;
struct passwd *pa = getpwuid(getuid());
struct passwd* pa = getpwuid(getuid());
char *p, *correct, *supplied, *salt;
shadow_entry = getspnam(pa->pw_name);
if (shadow_entry == NULL)
@ -200,15 +201,14 @@ int CheckPassword(char* password) {
return !!strcmp(supplied, correct);
}
void CreatePasswordMessage() {
puts("Incorrect password! Try again.");
}
void CreatePasswordMessage() { puts("Incorrect password! Try again."); }
void cats(char **str, const char *str2) {
char *tmp = NULL;
void cats(char** str, const char* str2)
{
char* tmp = NULL;
// Reset *str
if ( *str != NULL && str2 == NULL ) {
if (*str != NULL && str2 == NULL) {
free(*str);
*str = NULL;
return;
@ -216,36 +216,50 @@ void cats(char **str, const char *str2) {
// Initial copy
if (*str == NULL) {
*str = calloc( strlen(str2)+1, sizeof(char) );
memcpy( *str, str2, strlen(str2) );
}
else { // Append
tmp = calloc( strlen(*str)+1, sizeof(char) );
memcpy( tmp, *str, strlen(*str) );
*str = calloc( strlen(*str)+strlen(str2)+1, sizeof(char) );
memcpy( *str, tmp, strlen(tmp) );
memcpy( *str + strlen(*str), str2, strlen(str2) );
*str = calloc(strlen(str2) + 1, sizeof(char));
memcpy(*str, str2, strlen(str2));
} else { // Append
tmp = calloc(strlen(*str) + 1, sizeof(char));
memcpy(tmp, *str, strlen(*str));
*str = calloc(strlen(*str) + strlen(str2) + 1, sizeof(char));
memcpy(*str, tmp, strlen(tmp));
memcpy(*str + strlen(*str), str2, strlen(str2));
free(tmp);
}
}
void get_password(char *password)
void get_password(char* password)
{
static struct termios new_terminal;
int ttyfd = open("/dev/tty", O_RDWR);
tcgetattr(ttyfd, &old_terminal);
new_terminal = old_terminal;
new_terminal.c_lflag &= ~(ECHO);
tcsetattr(STDIN_FILENO, TCSANOW, &new_terminal);
tcsetattr(ttyfd, TCSAFLUSH, &new_terminal);
if (fgets(password, BUFSIZ, stdin) == NULL)
password[0] = '\0';
else
password[strlen(password)-1] = '\0';
write(ttyfd, "Password: ", 11);
getln(ttyfd, password, sizeof(password));
tcsetattr(ttyfd, TCSAFLUSH, &old_terminal);
close(ttyfd);
putchar('\n');
tcsetattr(STDIN_FILENO, TCSANOW, &old_terminal);
}
void getln(int fd, char* buf, size_t bufsiz)
{
ssize_t nr = -1;
char ch;
while ((nr = read(fd, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
if (buf < buf + bufsiz - 1) {
*buf++ = ch;
}
}
*buf = '\0';
}