author | Johan Herland <johan@herland.net> | 2010-11-15 19:40:43 (UTC) |
---|---|---|
committer | Lars Hjemli <larsh@prediktor.no> | 2010-11-16 08:03:43 (UTC) |
commit | 682adbc0cad2baa1a6119013b166f52de3ee3352 (patch) (unidiff) | |
tree | bef3cd4f21672a40399816dcbcab2fedf20b5f5f | |
parent | 17596459fe9a43428a261e66f65b227d15bf7ee5 (diff) | |
download | cgit-682adbc0cad2baa1a6119013b166f52de3ee3352.zip cgit-682adbc0cad2baa1a6119013b166f52de3ee3352.tar.gz cgit-682adbc0cad2baa1a6119013b166f52de3ee3352.tar.bz2 |
scan_path(): Improve handling of inaccessible directories
When scanning a tree containing inaccessible directories (e.g. '.ssh'
directories in users' homedirs, or repos with explicitly restricted access),
scan_path() currently causes three lines of "Permissions denied" errors to be
printed to the CGI error log per inaccessible directory:
Error checking path /home/foo/.ssh: Permission denied (13)
Error checking path /home/foo/.ssh/.git: Permission denied (13)
Error opening directory /home/foo/.ssh: Permission denied (13)
This is a side-effect of calling is_git_dir(path) and
is_git_dir(fmt("%s/.git", path) _before_ we try to opendir(path).
By placing the opendir(path) before the two is_git_dir() calls, we reduce the
noise to a single line per inaccessible directory:
Error opening directory /home/foo/.ssh: Permission denied (13)
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <larsh@prediktor.no>
-rw-r--r-- | scan-tree.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scan-tree.c b/scan-tree.c index a0e09ce..eda8c67 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -114,126 +114,126 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
114 | if (pwd->pw_gecos) | 114 | if (pwd->pw_gecos) |
115 | if ((p = strchr(pwd->pw_gecos, ','))) | 115 | if ((p = strchr(pwd->pw_gecos, ','))) |
116 | *p = '\0'; | 116 | *p = '\0'; |
117 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); | 117 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); |
118 | } | 118 | } |
119 | repo->owner = owner; | 119 | repo->owner = owner; |
120 | 120 | ||
121 | p = fmt("%s/description", path); | 121 | p = fmt("%s/description", path); |
122 | if (!stat(p, &st)) | 122 | if (!stat(p, &st)) |
123 | readfile(p, &repo->desc, &size); | 123 | readfile(p, &repo->desc, &size); |
124 | 124 | ||
125 | if (!repo->readme) { | 125 | if (!repo->readme) { |
126 | p = fmt("%s/README.html", path); | 126 | p = fmt("%s/README.html", path); |
127 | if (!stat(p, &st)) | 127 | if (!stat(p, &st)) |
128 | repo->readme = "README.html"; | 128 | repo->readme = "README.html"; |
129 | } | 129 | } |
130 | if (ctx.cfg.section_from_path) { | 130 | if (ctx.cfg.section_from_path) { |
131 | n = ctx.cfg.section_from_path; | 131 | n = ctx.cfg.section_from_path; |
132 | if (n > 0) { | 132 | if (n > 0) { |
133 | slash = rel; | 133 | slash = rel; |
134 | while (slash && n && (slash = strchr(slash, '/'))) | 134 | while (slash && n && (slash = strchr(slash, '/'))) |
135 | n--; | 135 | n--; |
136 | } else { | 136 | } else { |
137 | slash = rel + strlen(rel); | 137 | slash = rel + strlen(rel); |
138 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) | 138 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) |
139 | n++; | 139 | n++; |
140 | } | 140 | } |
141 | if (slash && !n) { | 141 | if (slash && !n) { |
142 | *slash = '\0'; | 142 | *slash = '\0'; |
143 | repo->section = xstrdup(rel); | 143 | repo->section = xstrdup(rel); |
144 | *slash = '/'; | 144 | *slash = '/'; |
145 | if (!prefixcmp(repo->name, repo->section)) { | 145 | if (!prefixcmp(repo->name, repo->section)) { |
146 | repo->name += strlen(repo->section); | 146 | repo->name += strlen(repo->section); |
147 | if (*repo->name == '/') | 147 | if (*repo->name == '/') |
148 | repo->name++; | 148 | repo->name++; |
149 | } | 149 | } |
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | p = fmt("%s/cgitrc", path); | 153 | p = fmt("%s/cgitrc", path); |
154 | if (!stat(p, &st)) { | 154 | if (!stat(p, &st)) { |
155 | config_fn = fn; | 155 | config_fn = fn; |
156 | parse_configfile(xstrdup(p), &repo_config); | 156 | parse_configfile(xstrdup(p), &repo_config); |
157 | } | 157 | } |
158 | } | 158 | } |
159 | 159 | ||
160 | static void scan_path(const char *base, const char *path, repo_config_fn fn) | 160 | static void scan_path(const char *base, const char *path, repo_config_fn fn) |
161 | { | 161 | { |
162 | DIR *dir; | 162 | DIR *dir = opendir(path); |
163 | struct dirent *ent; | 163 | struct dirent *ent; |
164 | char *buf; | 164 | char *buf; |
165 | struct stat st; | 165 | struct stat st; |
166 | 166 | ||
167 | if (!dir) { | ||
168 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | ||
169 | path, strerror(errno), errno); | ||
170 | return; | ||
171 | } | ||
167 | if (is_git_dir(path)) { | 172 | if (is_git_dir(path)) { |
168 | add_repo(base, path, fn); | 173 | add_repo(base, path, fn); |
169 | return; | 174 | goto end; |
170 | } | 175 | } |
171 | if (is_git_dir(fmt("%s/.git", path))) { | 176 | if (is_git_dir(fmt("%s/.git", path))) { |
172 | add_repo(base, fmt("%s/.git", path), fn); | 177 | add_repo(base, fmt("%s/.git", path), fn); |
173 | return; | 178 | goto end; |
174 | } | ||
175 | dir = opendir(path); | ||
176 | if (!dir) { | ||
177 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | ||
178 | path, strerror(errno), errno); | ||
179 | return; | ||
180 | } | 179 | } |
181 | while((ent = readdir(dir)) != NULL) { | 180 | while((ent = readdir(dir)) != NULL) { |
182 | if (ent->d_name[0] == '.') { | 181 | if (ent->d_name[0] == '.') { |
183 | if (ent->d_name[1] == '\0') | 182 | if (ent->d_name[1] == '\0') |
184 | continue; | 183 | continue; |
185 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') | 184 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') |
186 | continue; | 185 | continue; |
187 | } | 186 | } |
188 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); | 187 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); |
189 | if (!buf) { | 188 | if (!buf) { |
190 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | 189 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", |
191 | path, strerror(errno), errno); | 190 | path, strerror(errno), errno); |
192 | exit(1); | 191 | exit(1); |
193 | } | 192 | } |
194 | sprintf(buf, "%s/%s", path, ent->d_name); | 193 | sprintf(buf, "%s/%s", path, ent->d_name); |
195 | if (stat(buf, &st)) { | 194 | if (stat(buf, &st)) { |
196 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 195 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
197 | buf, strerror(errno), errno); | 196 | buf, strerror(errno), errno); |
198 | free(buf); | 197 | free(buf); |
199 | continue; | 198 | continue; |
200 | } | 199 | } |
201 | if (S_ISDIR(st.st_mode)) | 200 | if (S_ISDIR(st.st_mode)) |
202 | scan_path(base, buf, fn); | 201 | scan_path(base, buf, fn); |
203 | free(buf); | 202 | free(buf); |
204 | } | 203 | } |
204 | end: | ||
205 | closedir(dir); | 205 | closedir(dir); |
206 | } | 206 | } |
207 | 207 | ||
208 | #define lastc(s) s[strlen(s) - 1] | 208 | #define lastc(s) s[strlen(s) - 1] |
209 | 209 | ||
210 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) | 210 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) |
211 | { | 211 | { |
212 | char line[MAX_PATH * 2], *z; | 212 | char line[MAX_PATH * 2], *z; |
213 | FILE *projects; | 213 | FILE *projects; |
214 | int err; | 214 | int err; |
215 | 215 | ||
216 | projects = fopen(projectsfile, "r"); | 216 | projects = fopen(projectsfile, "r"); |
217 | if (!projects) { | 217 | if (!projects) { |
218 | fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", | 218 | fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", |
219 | projectsfile, strerror(errno), errno); | 219 | projectsfile, strerror(errno), errno); |
220 | } | 220 | } |
221 | while (fgets(line, sizeof(line), projects) != NULL) { | 221 | while (fgets(line, sizeof(line), projects) != NULL) { |
222 | for (z = &lastc(line); | 222 | for (z = &lastc(line); |
223 | strlen(line) && strchr("\n\r", *z); | 223 | strlen(line) && strchr("\n\r", *z); |
224 | z = &lastc(line)) | 224 | z = &lastc(line)) |
225 | *z = '\0'; | 225 | *z = '\0'; |
226 | if (strlen(line)) | 226 | if (strlen(line)) |
227 | scan_path(path, fmt("%s/%s", path, line), fn); | 227 | scan_path(path, fmt("%s/%s", path, line), fn); |
228 | } | 228 | } |
229 | if ((err = ferror(projects))) { | 229 | if ((err = ferror(projects))) { |
230 | fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n", | 230 | fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n", |
231 | projectsfile, strerror(err), err); | 231 | projectsfile, strerror(err), err); |
232 | } | 232 | } |
233 | fclose(projects); | 233 | fclose(projects); |
234 | } | 234 | } |
235 | 235 | ||
236 | void scan_tree(const char *path, repo_config_fn fn) | 236 | void scan_tree(const char *path, repo_config_fn fn) |
237 | { | 237 | { |
238 | scan_path(path, path, fn); | 238 | scan_path(path, path, fn); |
239 | } | 239 | } |