Skip to content

Commit

Permalink
enhance uri parser, resolve #5
Browse files Browse the repository at this point in the history
  • Loading branch information
@tuanpmt
tuanpmt committed Sep 27, 2017
1 parent 252c4ca commit 295dc65
Show file tree
Hide file tree
Showing 3 changed files with 213 additions and 149 deletions.
2 changes: 1 addition & 1 deletion library.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP8266MQTTClient
version=1.0.3
version=1.0.4
author=Tuan PM
maintainer=Tuan PM
sentence=MQTT Client for ESP8266
Expand Down
354 changes: 208 additions & 146 deletions src/uri_parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,167 +23,229 @@ License (MIT license):
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <ctype.h>
static __inline__ int
_is_scheme_char(int c)
{
return (!isalpha(c) && '+' != c && '-' != c && '.' != c) ? 0 : 1;
return (!isalpha(c) && '+' != c && '-' != c && '.' != c) ? 0 : 1;
}

#define JUMP_NEXT_STATE(var, state) { *curr_ptr = 0; curr_ptr ++; var = curr_ptr; parse_state = state; break;}
parsed_uri_t *parse_uri(const char *url)
{
parsed_uri_t *puri;
char *curr_ptr;
int bracket_flag;
enum parse_state_t {
PARSE_SCHEME = 0,
PARSE_USERNAME_OR_HOST,
PARSE_PASSWORD_OR_PORT,
PARSE_HOST,
PARSE_PORT,
PARSE_PATH,
PARSE_QUERY,
PARSE_FRAGMENT
} parse_state = 0;
puri = (parsed_uri_t *)malloc(sizeof(parsed_uri_t));
if(NULL == puri) {
return NULL;
}
puri->_uri_len = strlen(url);
puri->_uri = (char*) malloc(puri->_uri_len + 1);
if(puri->_uri == NULL) {
free_parsed_uri(puri);
return NULL;
}
strcpy(puri->_uri, url);
puri->_uri[puri->_uri_len] = 0;
puri->scheme = NULL;
puri->host = NULL;
puri->port = NULL;
puri->path = NULL;
puri->query = NULL;
puri->fragment = NULL;
puri->username = NULL;
puri->password = NULL;
parsed_uri_t *puri;
char *curr_ptr;
int bracket_flag;
enum parse_state_t {
PARSE_SCHEME = 0,
PARSE_USERNAME_OR_HOST,
PARSE_PASSWORD_OR_PORT,
PARSE_HOST,
PARSE_PORT,
PARSE_PATH,
PARSE_QUERY,
PARSE_FRAGMENT
} parse_state = 0;
puri = (parsed_uri_t *)malloc(sizeof(parsed_uri_t));
memset(puri, 0, sizeof(parsed_uri_t));
if(NULL == puri) {
return NULL;
}
puri->_uri_len = strlen(url);
puri->_uri = (char*) malloc(puri->_uri_len + 1);
memset(puri->_uri, 0, puri->_uri_len + 1);
if(puri->_uri == NULL) {
free_parsed_uri(puri);
return NULL;
}
strcpy(puri->_uri, url);
puri->_uri[puri->_uri_len] = 0;
puri->scheme = NULL;
puri->host = NULL;
puri->port = NULL;
puri->path = NULL;
puri->query = NULL;
puri->fragment = NULL;
puri->username = NULL;
puri->password = NULL;

curr_ptr = puri->_uri;
puri->scheme = curr_ptr;
parse_state = PARSE_SCHEME;
bracket_flag = 0;
while(*curr_ptr) {
*curr_ptr = tolower(*curr_ptr);
switch(parse_state) {
case PARSE_SCHEME: /* parse scheme */
if(curr_ptr + 3 < (puri->_uri + puri->_uri_len) && memcmp(curr_ptr, "://", 3) == 0) {
*curr_ptr++ = 0;
*curr_ptr++ = 0;
*curr_ptr++ = 0;
puri->host = curr_ptr;
puri->username = curr_ptr;
parse_state = PARSE_USERNAME_OR_HOST; //next is username or host
break;
}
if(!_is_scheme_char(*curr_ptr)) {
free_parsed_uri(puri);
return NULL;
}
curr_ptr ++;
break;
case PARSE_USERNAME_OR_HOST: /* username or host*/
if('[' == *curr_ptr && bracket_flag == 0) {
bracket_flag = 1;
} else if(']' == *curr_ptr && bracket_flag == 1) {
bracket_flag = 0;
}
if(bracket_flag == 0 && *curr_ptr == ':') {
JUMP_NEXT_STATE(puri->port = puri->password, PARSE_PASSWORD_OR_PORT);
} else if(bracket_flag == 0 && *curr_ptr == '#') {
puri->username = NULL;
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
} else if(bracket_flag == 0 && *curr_ptr == '/') {
curr_ptr = puri->_uri;
puri->scheme = curr_ptr;
parse_state = PARSE_SCHEME;
bracket_flag = 0;
while(*curr_ptr) {
// *curr_ptr = tolower((unsigned char)*curr_ptr);
switch(parse_state) {
case PARSE_SCHEME: /* parse scheme */
if(curr_ptr + 3 < (puri->_uri + puri->_uri_len) && memcmp(curr_ptr, "://", 3) == 0) {
*curr_ptr++ = 0;
*curr_ptr++ = 0;
*curr_ptr++ = 0;
puri->host = curr_ptr;
puri->username = curr_ptr;
parse_state = PARSE_USERNAME_OR_HOST; //next is username or host
break;
}
// if(!_is_scheme_char(*curr_ptr)) {
// free_parsed_uri(puri);
// return NULL;
// }
curr_ptr ++;
break;
case PARSE_USERNAME_OR_HOST: /* username or host*/
if('[' == *curr_ptr && bracket_flag == 0) {
bracket_flag = 1;
} else if(']' == *curr_ptr && bracket_flag == 1) {
bracket_flag = 0;
}
if(bracket_flag == 0 && *curr_ptr == ':') {
JUMP_NEXT_STATE(puri->port = puri->password, PARSE_PASSWORD_OR_PORT);
} else if(bracket_flag == 0 && *curr_ptr == '#') {
puri->username = NULL;
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
} else if(bracket_flag == 0 && *curr_ptr == '/') {
puri->username = NULL;
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
}
curr_ptr ++;
break;
case PARSE_PASSWORD_OR_PORT: /* password or port */
if(*curr_ptr == '@') {
puri->port = NULL;
JUMP_NEXT_STATE(puri->host, PARSE_HOST);
break;
} else if(*curr_ptr == '/') {
puri->username = NULL;
puri->password = NULL;
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
break;
} else if(*curr_ptr == '#') {
puri->username = NULL;
puri->password = NULL;
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
break;
}
curr_ptr ++;
break;
case PARSE_HOST: /* host */
if('[' == *curr_ptr && bracket_flag == 0) {
bracket_flag = 1;
} else if(']' == *curr_ptr && bracket_flag == 1) {
bracket_flag = 0;
}
if(bracket_flag == 0 && *curr_ptr == ':') {
JUMP_NEXT_STATE(puri->port, PARSE_PORT);
} else if(bracket_flag == 0 && *curr_ptr == '/') {
puri->port = NULL;
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
} else if(bracket_flag == 0 && *curr_ptr == '#') {
puri->port = NULL;
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
curr_ptr ++;
break;
case PARSE_PORT: /* port */
if(*curr_ptr == '/') {
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
} else if(*curr_ptr == '?') {
JUMP_NEXT_STATE(puri->query, PARSE_QUERY);
} else if(*curr_ptr == '#') {
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
curr_ptr ++;
break;
case PARSE_PATH: /* path */
if(*curr_ptr == '?') {
JUMP_NEXT_STATE(puri->query, PARSE_QUERY);
} else if(*curr_ptr == '#') {
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
curr_ptr ++;
case PARSE_QUERY: /* query */
if(*curr_ptr == '#') {
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
case PARSE_FRAGMENT: /* fragment*/
curr_ptr ++;
break;
}
curr_ptr ++;
break;
case PARSE_PASSWORD_OR_PORT: /* password or port */
if(*curr_ptr == '@') {
puri->port = NULL;
JUMP_NEXT_STATE(puri->host, PARSE_HOST);
break;
} else if(*curr_ptr == '/') {
puri->username = NULL;
puri->password = NULL;
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
break;
} else if(*curr_ptr == '#') {
puri->username = NULL;
puri->password = NULL;
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
break;
}
curr_ptr ++;
break;
case PARSE_HOST: /* host */
if('[' == *curr_ptr && bracket_flag == 0) {
bracket_flag = 1;
} else if(']' == *curr_ptr && bracket_flag == 1) {
bracket_flag = 0;
}
if(bracket_flag == 0 && *curr_ptr == ':') {
JUMP_NEXT_STATE(puri->port, PARSE_PORT);
} else if(bracket_flag == 0 && *curr_ptr == '/') {
puri->port = NULL;
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
} else if(bracket_flag == 0 && *curr_ptr == '#') {
puri->port = NULL;
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
curr_ptr ++;
break;
case PARSE_PORT: /* port */
if(*curr_ptr == '/') {
JUMP_NEXT_STATE(puri->path, PARSE_PATH);
} else if(*curr_ptr == '?') {
JUMP_NEXT_STATE(puri->query, PARSE_QUERY);
} else if(*curr_ptr == '#') {
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
curr_ptr ++;
break;
case PARSE_PATH: /* path */
if(*curr_ptr == '?') {
// JUMP_NEXT_STATE(puri->query, PARSE_QUERY);
} else if(*curr_ptr == '#') {
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
curr_ptr ++;
case PARSE_QUERY: /* query */
if(*curr_ptr == '#') {
JUMP_NEXT_STATE(puri->fragment, PARSE_FRAGMENT);
}
case PARSE_FRAGMENT: /* fragment*/
curr_ptr ++;
break;
}

}
if(parse_state < PARSE_HOST) {
puri->host = puri->username;
puri->port = puri->password;
puri->username = NULL;
puri->password = NULL;
}
}
if(parse_state < PARSE_HOST) {
puri->host = puri->username;
puri->port = puri->password;
puri->username = NULL;
puri->password = NULL;
}
if (puri->path && puri->path[0]!= 0){
char *temp = malloc(strlen(puri->path) + 2);
sprintf(temp, "/%s", puri->path);
puri->path = temp;
} else {
puri->path = malloc(2);
puri->path[0] = '/';
puri->path[1] = 0;
}
return puri;
}
void parse_uri_info(parsed_uri_t *puri)
{
printf( "scheme addr: %x\n"
"Username addr: %x\n"
"password addr: %x\n"
"host addr: %x\n"
"port addr: %x\n"
"path addr: %x\n"
"fragment addr: %x\n"
"extension addr: %x\n"
"host_ext addr: %x\r\n",
(int)puri->scheme,
(int)puri->username,
(int)puri->password,
(int)puri->host,
(int)puri->port,
(int)puri->path,
(int)puri->fragment,
(int)puri->extension,
(int)puri->host_ext);

return puri;
if(puri->scheme && puri->scheme[0] != 0) {
printf("scheme: %s\n", puri->scheme);
}
if(puri->host && puri->host[0] != 0) {
printf("Host: %s\n", puri->host);
}
if(puri->path && puri->path[0] != 0) {
printf("path: %s\n", puri->path);
}
if(puri->port && puri->port[0] != 0) {
printf("port: %s\n", puri->port);
}
if(puri->username && puri->username[0] != 0) {
printf("username: %s\n", puri->username);
}
if(puri->password && puri->password[0] != 0) {
printf("password: %s\n", puri->password);
}
if(puri->fragment && puri->fragment[0] != 0) {
printf("fragment: %s\n", puri->fragment);
}
if(puri->extension && puri->extension[0] != 0) {
printf("extension: %s\n", puri->extension);
}
if(puri->host_ext && puri->host_ext[0] != 0) {
printf("host_ext: %s\n", puri->host_ext);
}
}
void free_parsed_uri(parsed_uri_t *puri)
{
if(NULL != puri) {
if(NULL != puri->_uri) {
free(puri->_uri);
}
free(puri);
}
if(NULL != puri) {
if(puri->path && puri->path[0] != 0) {
free(puri->path);
}
if(NULL != puri->_uri) {
free(puri->_uri);
}
free(puri);
}
}
Loading

0 comments on commit 295dc65

Please sign in to comment.