Commit d7a2dd3e1ee8775ead889bac5465e4815e7c0fc3
2021-01-07T13:22:11
debug, ws
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
diff --git a/git-auth.c b/git-auth.c
index 0ed7e5a..0e21671 100644
--- a/git-auth.c
+++ b/git-auth.c
@@ -98,31 +98,33 @@ static void log_cmd (const char *op, int argc, const char **argv)
static int rule_match (s_rule *rule, int argc, const char **argv)
{
- assert(rule);
- assert(argc);
- assert(argv);
- if (argc != 3)
- return 0;
- log_rule("MATCH", rule);
- if (strcmp(rule->user, argv[0]))
- return 0;
- if (!strcmp(argv[1], "git-upload-pack") && !(rule->mode & 1))
- return 0;
- else if (!strcmp(argv[1], "git-receive-pack") && !(rule->mode & 2))
- return 0;
- if (strcmp(rule->path, argv[2]))
- return 0;
- return 1;
+ assert(rule);
+ assert(argc);
+ assert(argv);
+ if (argc != 3)
+ return 0;
+ if (strcmp(rule->user, argv[0]))
+ return 0;
+ if (!strcmp(argv[1], "git-upload-pack") && !(rule->mode & 1))
+ return 0;
+ else if (!strcmp(argv[1], "git-receive-pack") && !(rule->mode & 2))
+ return 0;
+ if (strcmp(rule->path, argv[2]))
+ return 0;
+ return 1;
}
static int auth (s_rule rules[RULES_MAX], int argc, const char **argv)
{
int r = 0;
while (rules[r].user) {
+ log_rule("MATCH", &rules[r]);
if (rule_match(&rules[r], argc, argv)) {
log_rule("ALLOW", &rules[r]);
return 1;
}
+ else
+ log_rule("DENY", &rules[r]);
r++;
}
return 0;
@@ -130,26 +132,26 @@ static int auth (s_rule rules[RULES_MAX], int argc, const char **argv)
static void cleanup (void)
{
- closelog();
+ closelog();
}
static void exec_cmd (int argc, const char **argv)
{
- char buf[2048];
- int cmd_argc;
- const char *cmd_argv[4];
- assert(argc);
- assert(argv);
- cmd_argc = 3;
- cmd_argv[0] = GIT_SHELL;
- cmd_argv[1] = "-c";
- stracat(buf, sizeof(buf), argc - 1, argv + 1);
- cmd_argv[2] = buf;
- cmd_argv[3] = NULL;
- log_cmd("EXEC", cmd_argc, cmd_argv);
- cleanup();
- execvp(cmd_argv[0], (char *const *) (cmd_argv + 1));
- err(1, "%s", cmd_argv[0]);
+ char buf[2048];
+ int cmd_argc;
+ const char *cmd_argv[4];
+ assert(argc);
+ assert(argv);
+ cmd_argc = 3;
+ cmd_argv[0] = GIT_SHELL;
+ cmd_argv[1] = "-c";
+ stracat(buf, sizeof(buf), argc - 1, argv + 1);
+ cmd_argv[2] = buf;
+ cmd_argv[3] = NULL;
+ log_cmd("EXEC", cmd_argc, cmd_argv);
+ cleanup();
+ execvp(cmd_argv[0], (char *const *) (cmd_argv + 1));
+ err(1, "%s", cmd_argv[0]);
}
static void usage (const char *argv0)
diff --git a/rule.c b/rule.c
index c956e95..2db6d3a 100644
--- a/rule.c
+++ b/rule.c
@@ -154,7 +154,9 @@ int read_rules (s_rule rules[RULES_MAX], const char *path)
if (ferror(fp))
err(1, "%s", path);
bzero(&rules[r], sizeof(s_rule));
- fprintf(stderr, "fgets NULL. r: %d\n", r);
+ if (error)
+ exit(1);
+ // fprintf(stderr, "fgets NULL. r: %d\n", r);
return r;
}
if (!(nl = strchr(buf, '\n'))) {
@@ -176,6 +178,6 @@ int read_rules (s_rule rules[RULES_MAX], const char *path)
bzero(&rules[r], sizeof(s_rule));
if (error)
exit(1);
- fprintf(stderr, "EOF. r: %d\n", r);
+ // fprintf(stderr, "EOF. r: %d\n", r);
return r;
}