Sun, 23 Nov 2025 13:27:13 +0100
fix location match type initializataion
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2025 Olaf Wintermann. All rights reserved. |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "location.h" |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include "config.h" |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
31 | #include "request.h" |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | #include "../util/util.h" |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
33 | #include "../util/pblock.h" |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
34 | #include "vserver.h" |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <cx/linked_list.h> |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | #define DIR_CHECK_ARGC(n) if(argc != n) { \ |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | log_ereport(LOG_FAILURE, "%s directive argc != %d", name.ptr, n); \ |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | return 1; \ |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | static void location_list_add(WSLocation *location, WSLocation *sub) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | void **begin = (void**)&location->children_begin; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | void **end = (void**)&location->children_end; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | cx_linked_list_add(begin, end, offsetof(WSLocation, prev), offsetof(WSLocation, next), sub); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
48 | static int add_location_config(ServerConfiguration *cfg, WSLocation *location, ConfigNode *dir) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
49 | const CxAllocator *a = cfg->a; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
50 | |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | cxmutstr name = dir->name; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | int argc = serverconfig_directive_count_args(dir); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | if(!cx_strcasecmp(name, "DirectoryIndex")) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | DIR_CHECK_ARGC(1); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | location->config.set_dirindex = TRUE; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | location->config.dirindex = util_getboolean_s(cx_strcast(dir->args->value), FALSE); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | } else if(!cx_strcasecmp(name, "DocumentRoot")) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | DIR_CHECK_ARGC(1); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | location->config.docroot = cx_strdup_a(a, dir->args->value); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | } else if(!cx_strcasecmp(name, "Location")) { |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
61 | WSLocation *sub_location = cfg_location_get(cfg, dir); |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | if(!sub_location) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | return 1; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | location_list_add(location, sub_location); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | return 0; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
72 | WSLocation* cfg_location_get(ServerConfiguration *cfg, ConfigNode *obj) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
73 | const CxAllocator *a = cfg->a; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
74 | |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | WSLocationMatch match = WS_LOCATION_MATCH_EXACT; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | cxmutstr match_str; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
78 | int regex_flags = REG_EXTENDED | REG_NOSUB; |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | int argc = serverconfig_directive_count_args(obj); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | if(argc == 2) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | // arg0: match type |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | cxmutstr type_str = obj->args->value; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | if(!cx_strcmp(type_str, "=")) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | // noop |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | } else if(!cx_strcmp(type_str, "^~")) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | match = WS_LOCATION_MATCH_PREFIX; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | } else if(!cx_strcmp(type_str, "~")) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | match = WS_LOCATION_MATCH_CS_REGEX; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | } else if(!cx_strcmp(type_str, "~*")) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | match = WS_LOCATION_MATCH_CI_REGEX; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | regex_flags |= REG_ICASE; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | } else { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | log_ereport(LOG_FAILURE, "Location: unknown operator %.*s", (int)type_str.length, type_str.ptr); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | return NULL; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | // arg1: match_string |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | match_str = obj->args->next->value; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | } else if(argc == 1) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | // arg0: match_string |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | match_str = obj->args->value; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | } else if(argc > 2) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | log_ereport(LOG_FAILURE, "Location directive must have 0-2 args"); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | return NULL; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | WSLocation *location = cxZalloc(a, sizeof(WSLocation)); |
|
637
85721a583f39
fix location match type initializataion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
636
diff
changeset
|
108 | location->match = match; |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | location->match_string = cx_strdup_a((a), match_str); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | if(match == WS_LOCATION_MATCH_CS_REGEX || match == WS_LOCATION_MATCH_CI_REGEX) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | if(regcomp(&location->regex, match_str.ptr, regex_flags)) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | log_ereport(LOG_FAILURE, "Location: cannot compile regex pattern %s", match_str.ptr); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | return NULL; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
116 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
117 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
118 | ConfigNode *dir = obj->children_begin; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
119 | while(dir) { |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
120 | if(dir->type == CONFIG_NODE_OBJECT || dir->type == CONFIG_NODE_DIRECTIVE) { |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
121 | if(add_location_config(cfg, location, dir)) { |
|
635
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | log_ereport(LOG_FAILURE, "Location %s: abort", match_str.ptr); |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | return NULL; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
124 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
125 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
126 | dir = dir->next; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
127 | } |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
128 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
129 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | return location; |
|
b85d45fd3b01
add location config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | } |
|
636
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
133 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
134 | int location_apply_config(WSLocationConfig *target, WSLocation *loc) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
135 | WSLocationConfig *src = &loc->config; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
136 | if(src->set_dirindex) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
137 | target->set_dirindex = TRUE; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
138 | target->dirindex = src->dirindex; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
139 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
140 | if(src->set_forcetls) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
141 | target->set_forcetls = TRUE; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
142 | target->forcetls = src->forcetls; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
143 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
144 | if(src->docroot.ptr) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
145 | target->docroot = src->docroot; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
146 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
147 | if(src->name.ptr) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
148 | target->name = src->name; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
149 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
150 | if(src->dav) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
151 | target->dav = src->dav; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
152 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
153 | // TODO: ... |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
154 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
155 | return 0; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
156 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
157 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
158 | int location_match(WSLocation *loc, cxstring uri) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
159 | if(loc->match == WS_LOCATION_MATCH_EXACT) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
160 | return !cx_strcmp(loc->match_string, uri); |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
161 | } else if(loc->match == WS_LOCATION_MATCH_PREFIX) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
162 | return cx_strprefix(uri, loc->match_string); |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
163 | } else { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
164 | return regexec(&loc->regex, uri.ptr, 0, NULL, 0) == 0; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
165 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
166 | return 0; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
167 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
168 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
169 | WSLocationConfig* location_match_and_get_config(pool_handle_t *pool, cxstring uri, WSLocation *loc) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
170 | WSLocationConfig *config = pool_malloc(pool, sizeof(WSLocationConfig)); |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
171 | if(!config) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
172 | return NULL; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
173 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
174 | ZERO(config, sizeof(WSLocationConfig)); |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
175 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
176 | while(loc) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
177 | if(location_match(loc, uri)) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
178 | if(location_apply_config(config, loc)) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
179 | return NULL; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
180 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
181 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
182 | loc = loc->next; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
183 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
184 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
185 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
186 | return config; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
187 | } |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
188 | |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
189 | WSLocationConfig* cfg_location_match(Session *sn, Request *rq) { |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
190 | NSAPIRequest *req = (NSAPIRequest*)rq; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
191 | WSLocation *loc = req->vs->locations_begin; |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
192 | char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
193 | return location_match_and_get_config(sn->pool, cx_str(uri), loc); |
|
40f069ddda37
add match_location nametrans SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
635
diff
changeset
|
194 | } |