/[osn-commons]/trunk/freehttpd/request.c
ViewVC logotype

Diff of /trunk/freehttpd/request.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 44 by rakinar2, Sat Aug 10 18:33:37 2024 UTC revision 46 by rakinar2, Mon Aug 12 16:55:32 2024 UTC
# Line 4  Line 4 
4  #include <stdio.h>  #include <stdio.h>
5  #include <stdlib.h>  #include <stdlib.h>
6  #include <string.h>  #include <string.h>
7    #include <sys/socket.h>
8  #include <unistd.h>  #include <unistd.h>
9    
10  freehttpd_request_t *  freehttpd_request_t *
# Line 38  freehttpd_request_init (const char *meth Line 39  freehttpd_request_init (const char *meth
39  }  }
40    
41  freehttpd_header_t *  freehttpd_header_t *
42  freehttpd_header_init (const char *name, const char *value)  freehttpd_header_init (const char *name, const char *value, size_t name_length,
43                           size_t value_length)
44  {  {
45      freehttpd_header_t *header = calloc (1, sizeof (freehttpd_header_t));      freehttpd_header_t *header = calloc (1, sizeof (freehttpd_header_t));
46    
47      if (header == NULL)      if (header == NULL)
48          return NULL;          return NULL;
49    
50        freehttpd_header_t on_stack
51            = freehttpd_header_init_stack (name, value, name_length, value_length);
52        memcpy (header, &on_stack, sizeof (freehttpd_header_t));
53    
54        return header;
55    }
56    
57    freehttpd_header_t
58    freehttpd_header_init_stack (const char *name, const char *value,
59                                 size_t name_length, size_t value_length)
60    {
61        freehttpd_header_t header = { 0 };
62    
63      if (name != NULL)      if (name != NULL)
64          header->name = strdup (name);          {
65                header.name = strdup (name);
66                header.name_length = name_length == 0 ? strlen (name) : name_length;
67            }
68    
69      if (value != NULL)      if (value != NULL)
70          header->value = strdup (value);          {
71                header.value = strdup (value);
72                header.value_length
73                    = value_length == 0 ? strlen (value) : value_length;
74            }
75    
76      return header;      return header;
77  }  }
# Line 82  freehttpd_request_free (freehttpd_reques Line 104  freehttpd_request_free (freehttpd_reques
104          free (request->uri);          free (request->uri);
105    
106      if (request->version != NULL)      if (request->version != NULL)
107          free (request->version);          free (request->version - 5);
108    
109        if (request->path != NULL)
110            free (request->path);
111    
112        if (request->query != NULL)
113            free (request->query);
114    
115      if (request->headers != NULL)      if (request->headers != NULL)
116          {          {
# Line 98  freehttpd_request_free (freehttpd_reques Line 126  freehttpd_request_free (freehttpd_reques
126      free (request);      free (request);
127  }  }
128    
129    static char *
130    urldecode (const char *input, size_t *len)
131    {
132        char *output = calloc (strlen (input) + 1, 1);
133    
134        if (output == NULL)
135            return NULL;
136    
137        size_t i = 0, j = 0;
138    
139        for (; input[i] != 0; i++, j++)
140            {
141                if (input[i] == '%')
142                    {
143                        if (input[i + 1] == 0 || input[i + 2] == 0)
144                            {
145                                free (output);
146                                return NULL;
147                            }
148    
149                        char c1 = tolower (input[i + 1]);
150                        char c2 = tolower (input[i + 2]);
151                        int c1n = isdigit (c1) ? c1 - '0' : c1 - 'a' + 10;
152                        int c2n = isdigit (c2) ? c2 - '0' : c2 - 'a' + 10;
153                        int code = c1n * 16 + c2n;
154                        output[j] = (char) code;
155                        i += 2;
156                    }
157                else
158                    output[j] = input[i];
159            }
160    
161        output[j] = 0;
162    
163        printf ("output: %s\n", output);
164    
165        if (len != NULL)
166            *len = j;
167    
168        return output;
169    }
170    
171  const char *const SUPPORTED_METHODS[]  const char *const SUPPORTED_METHODS[]
172      = { "GET",     "POST",  "PUT",     "DELETE", "HEAD",      = { "GET",     "POST",  "PUT",     "DELETE", "HEAD",
173          "OPTIONS", "TRACE", "CONNECT", NULL };          "OPTIONS", "TRACE", "CONNECT", NULL };
# Line 126  freehttpd_request_parse (freehttpd_t *fr Line 196  freehttpd_request_parse (freehttpd_t *fr
196              char c;              char c;
197              size_t j = 0;              size_t j = 0;
198    
199              while (read (sockfd, &c, 1) == 1)              /* TODO: instead of always calling read with size 1, we could
200                   optimize this by reading more bytes at once and then parsing
201                   the buffer. */
202                while (recv (sockfd, &c, 1, 0) == 1)
203                  {                  {
204                      if (isspace (c))                      if (isspace (c))
205                          break;                          break;
# Line 172  freehttpd_request_parse (freehttpd_t *fr Line 245  freehttpd_request_parse (freehttpd_t *fr
245              return NULL;              return NULL;
246          }          }
247    
248        if (memcmp (request->version, "HTTP/", 5) != 0)
249            {
250                freehttpd_request_free (request);
251                *error = E_MALFORMED_REQUEST;
252                return NULL;
253            }
254    
255        request->version += 5;
256        request->version_length -= 5;
257    
258        char *path = strchr (request->uri, '?');
259    
260        if (path != NULL)
261            {
262                path = strndup (request->uri, path - request->uri);
263                request->query = strdup (path + 1);
264                request->query_length
265                    = request->uri_length - request->path_length - 1;
266            }
267        else
268            path = strdup (request->uri);
269    
270        request->path = urldecode (path, &request->path_length);
271        free (path);
272      *error = E_OK;      *error = E_OK;
273      return request;      return request;
274  }  }
Legend:
Removed from v.44  
changed lines
  Added in v.46
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26