Fix bug with negative minutes

[rbdr/ngx_http_office_hours_filter_module] / ngx_http_office_hours_filter_module.c

diff --git a/ngx_http_office_hours_filter_module.c b/ngx_http_office_hours_filter_module.c
index 773b6d2dc7defa5a71a1b1a2856bec4189866c2d..ee914b1a76ed245e331ae5493d323f02354b3e1e 100644 (file)
--- a/ngx_http_office_hours_filter_module.c
+++ b/ngx_http_office_hours_filter_module.c
@@ -24,6 +24,7 @@
 
 const ngx_uint_t WEEK_LENGTH = 7;
 const char * CLOSED_TOKEN = "closed";
+const ngx_str_t TIME_REGEX = ngx_string("([0-9]{1,2})(?:\\:([0-9]{2}))?\\-([0-9]{1,2})(?:\\:([0-9]{2}))?");
 
 /* Main Configuration Structure */
 
@@ -53,6 +54,10 @@ static ngx_uint_t * parse_office_hours_string(ngx_str_t office_hours);
 static ngx_flag_t within_office_hours(ngx_uint_t ** office_hours);
 static ngx_uint_t get_day_of_week(time_t time);
 static ngx_uint_t get_seconds_of_day(time_t time);
+static ngx_uint_t parse_number(ngx_str_t string, ngx_uint_t start, ngx_uint_t end);
+
+/* Compiled Regex */
+ngx_regex_compile_t rc;
 
 /*
  * Module Definitions
@@ -231,20 +236,6 @@ static char *ngx_http_office_hours_merge_conf(ngx_conf_t * cf,
     return NGX_CONF_OK;
 }
 
-/*
- * Postconfig Initialization Handler
- * Sets the request filter at the top of the chain
- */
-
-static ngx_int_t ngx_http_office_hours_init(ngx_conf_t * cf)
-{
-
-    ngx_http_next_body_filter = ngx_http_top_body_filter;
-    ngx_http_top_body_filter = ngx_http_office_hours_body_filter;
-
-    return NGX_OK;
-}
-
 /*
  * Parse the office hour strings in the configuration file
  * to fill out the hours array (in seconds)
@@ -289,6 +280,8 @@ static ngx_uint_t ** parse_office_hours(ngx_array_t * office_hours)
 static ngx_uint_t * parse_office_hours_string(ngx_str_t office_hours)
 {
 
+    int captures[(1 + 4) * 3];
+    ngx_int_t n;
     ngx_uint_t * parsed_hours;
 
     parsed_hours = malloc(2 * sizeof(ngx_uint_t));
@@ -299,6 +292,22 @@ static ngx_uint_t * parse_office_hours_string(ngx_str_t office_hours)
         return parsed_hours;
     }
 
+    n = ngx_regex_exec(rc.regex, &office_hours, captures, (1 + 4) * 3);
+
+    if (n >= 0) {
+        /* Opening Hours */
+
+        parsed_hours[0] = 60 * 60 * parse_number(office_hours, captures[2], captures[3]);
+        parsed_hours[0] = parsed_hours[0] + 60 * parse_number(office_hours, captures[4], captures[5]);
+
+        parsed_hours[1] = 60 * 60 * parse_number(office_hours, captures[6], captures[7]);
+        parsed_hours[1] = parsed_hours[1] + 60 * parse_number(office_hours, captures[8], captures[9]);
+
+        return parsed_hours;
+    }
+
+    /* Non-matching strings count as open */
+
     parsed_hours[0] = 0;
     parsed_hours[1] = 86400;
     return parsed_hours;
@@ -343,3 +352,36 @@ static ngx_uint_t get_seconds_of_day(time_t time)
 
     return time - (time / 86400) * 86400;
 }
+
+/*
+ * Parses a string, returns 0 if match was not found
+ */
+static ngx_uint_t parse_number(ngx_str_t string, ngx_uint_t start, ngx_uint_t end)
+{
+
+    if (end - start == 0) {
+        return 0;
+    }
+
+    return ngx_atoi(&string.data[start], end - start);
+}
+
+/*
+ * Postconfig Initialization Handler
+ * Sets the request filter at the top of the chain
+ */
+
+static ngx_int_t ngx_http_office_hours_init(ngx_conf_t * cf)
+{
+
+    ngx_http_next_body_filter = ngx_http_top_body_filter;
+    ngx_http_top_body_filter = ngx_http_office_hours_body_filter;
+
+    rc.pattern = TIME_REGEX;
+    rc.pool = cf->pool;
+    if (ngx_regex_compile(&rc) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}