Wed, 10 Jan 2018 17:25:55 +0100
fixes aio error handling
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
136
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
4 | * Copyright 2016 Olaf Wintermann. All rights reserved. |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
b8bf95b39952
New source folder layout
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 |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "nametrans.h" |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | |
77 | 31 | #include "../daemon/log.h" |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
97
diff
changeset
|
32 | #include "../daemon/request.h" |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include "../util/pblock.h" |
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
34 | #include "../util/util.h" |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | /* |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | * assign_name |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | * |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | * Assigns the name specified by the name parameter if the uri has the |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | * specified prefix. |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | * |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | * pblock parameter: |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | * name object name |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | * from optional uri prefix |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | */ |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | int assign_name(pblock *pb, Session *sn, Request *rq) { |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | /* TODO: expression instead of simple prefix */ |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | char *name = pblock_findkeyval(pb_key_name, pb); |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | char *from = pblock_findkeyval(pb_key_from, pb); |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | if(!name) { |
77 | 53 | log_ereport(LOG_MISCONFIG, "assign-name: missing name parameter"); |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | protocol_status(sn, rq, 500, NULL); |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | return REQ_ABORTED; |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | } |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | if(from) { |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | char c; |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | int i = 0; |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | while((c = from[i]) != 0) { |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | if(c != uri[i]) { |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | return REQ_NOACTION; |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | } |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | i++; |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | } |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | } |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | |
77 | 70 | // add object to rq->vars |
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | pblock_kvinsert(pb_key_name, name, strlen(name), rq->vars); |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | return REQ_NOACTION; |
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | } |
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
75 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
76 | /* |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
77 | * document_root |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
78 | * |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
79 | * Specifies the document root directory. |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
80 | * |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
81 | * pblock parameter: |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
82 | * root path to document root |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
83 | */ |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
84 | int document_root(pblock *pb, Session *sn, Request *rq) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
85 | char *root = pblock_findkeyval(pb_key_root, pb); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
86 | if(!root) { |
97
09fbefc0e6a9
added ldap group support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
96
diff
changeset
|
87 | log_ereport(LOG_MISCONFIG, "document-root: missing root parameter"); |
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
88 | protocol_status(sn, rq, 500, NULL); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
89 | return REQ_ABORTED; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
90 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
91 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
92 | sstr_t root_str = sstr(root); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
93 | sstr_t uri_str = sstr(pblock_findkeyval(pb_key_uri, rq->reqpb)); |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
97
diff
changeset
|
94 | |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
97
diff
changeset
|
95 | request_set_path(root_str, uri_str, rq->vars); |
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
96 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
97 | return REQ_PROCEED; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
98 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
99 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
100 | /* |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
101 | * pfx2dir |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
102 | * |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
103 | * ... |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
104 | * |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
105 | * pblock parameter: |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
106 | * from prefix |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
107 | * dir file system directory |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
108 | * name (optional) object name |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
109 | * |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
110 | */ |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
111 | int pfx2dir(pblock *pb, Session *sn, Request *rq) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
112 | char *from = pblock_findkeyval(pb_key_from, pb); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
113 | char *dir = pblock_findkeyval(pb_key_dir, pb); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
114 | char *name = pblock_findkeyval(pb_key_name, pb); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
115 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
116 | if(!from || !dir) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
117 | if(!from && dir) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
118 | log_ereport(LOG_MISCONFIG, "pfx2dir: missing from parameter"); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
119 | } else if(!dir && from) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
120 | log_ereport(LOG_MISCONFIG, "pfx2dir: missing dir parameter"); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
121 | } else { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
122 | log_ereport( |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
123 | LOG_MISCONFIG, |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
124 | "pfx2dir: missing from and dir parameter"); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
125 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
126 | protocol_status(sn, rq, 500, NULL); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
127 | return REQ_ABORTED; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
128 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
129 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
130 | // check prefix |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
131 | char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
132 | char fc; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
133 | char uc; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
134 | int i = 0; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
135 | while((fc = from[i]) != 0) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
136 | uc = uri[i]; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
137 | if(fc != uc) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
138 | return REQ_NOACTION; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
139 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
140 | i++; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
141 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
142 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
143 | // url has the specified prefix |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
144 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
145 | uri = uri + i; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
146 | if(uri[0] == '/') { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
147 | uri++; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
148 | } |
116
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
97
diff
changeset
|
149 | |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
97
diff
changeset
|
150 | request_set_path(sstr(dir), sstr(uri), rq->vars); |
d7a186cf87f6
adds find-pathinfo saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
97
diff
changeset
|
151 | |
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
152 | if(name) { |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
153 | // add object to rq->vars |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
154 | pblock_kvinsert(pb_key_name, name, strlen(name), rq->vars); |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
155 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
156 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
157 | return REQ_PROCEED; |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
158 | } |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
159 | |
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
160 | |
137
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
161 | int redirect(pblock *pb, Session *sn, Request *rq) { |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
162 | char *from = pblock_findval("from", pb); |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
163 | char *url = pblock_findval("url", pb); |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
164 | |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
165 | if(!from || !url) { |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
166 | log_ereport(LOG_MISCONFIG, "redirect: missing parameter (from, url)"); |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
167 | return REQ_ABORTED; |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
168 | } |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
169 | |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
170 | char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
171 | if(!strcmp(uri, from)) { |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
172 | pblock_nvinsert("location", url, rq->srvhdrs); |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
173 | |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
174 | protocol_status(sn, rq, 302, NULL); |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
175 | return REQ_ABORTED; |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
176 | } |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
177 | |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
178 | return REQ_NOACTION; |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
179 | } |
ca0cf1016a8b
adds redirect saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
136
diff
changeset
|
180 | |
136
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
181 | /* |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
182 | * provisional rewrite saf |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
183 | */ |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
184 | int simple_rewrite(pblock *pb, Session *sn, Request *rq) { |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
185 | char *from = pblock_findval("from", pb); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
186 | char *root = pblock_findval("root", pb); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
187 | char *path = pblock_findval("path", pb); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
188 | char *name = pblock_findval("name", pb); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
189 | |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
190 | if(!from || !path || !root) { |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
191 | log_ereport(LOG_MISCONFIG, "simple-rewrite: missing parameter (from, root, path)"); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
192 | return REQ_ABORTED; |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
193 | } |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
194 | |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
195 | char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
196 | sstr_t u = sstr(uri); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
197 | sstr_t f = sstr(from); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
198 | if(sstrprefix(u, f)) { |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
199 | sstr_t suf = sstrsubs(u, f.length); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
200 | sstr_t ppath = sstrcat(2, sstr(path), suf); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
201 | |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
202 | request_set_path(sstr(root), ppath, rq->vars); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
203 | free(ppath.ptr); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
204 | |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
205 | if(name) { |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
206 | // add object to rq->vars |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
207 | pblock_kvinsert(pb_key_name, name, strlen(name), rq->vars); |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
208 | } |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
209 | } |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
210 | |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
211 | return REQ_NOACTION; |
9b48a1427aef
adds simple rewrite saf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
117
diff
changeset
|
212 | } |