adjust w3c_to_time output by timezone, so that it returns local time

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 15 insertions, 5 deletions

diff --git a/lib/util.cc b/lib/util.cc
index e5ca62d..ee75d29 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -93,64 +93,74 @@ namespace opkele {
             vector<unsigned char> bin(BN_num_bytes(bn)+1);
             unsigned char *binptr = &(bin.front())+1;
             int l = BN_bn2bin(bn,binptr);
             if(l && (*binptr)&0x80){
                 (*(--binptr)) = 0; ++l;
             }
             return encode_base64(binptr,l);
         }
 
         /*
          * w3c times
          */
 
         string time_to_w3c(time_t t) {
             struct tm tm_t;
             if(!gmtime_r(&t,&tm_t))
                 throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()");
             char rv[25];
             if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t))
                 throw failed_conversion(OPKELE_CP_ "failed to strftime()");
             return rv;
         }
 
         time_t w3c_to_time(const string& w) {
+            int fraction;
             struct tm tm_t;
             memset(&tm_t,0,sizeof(tm_t));
-            if(
+            if( (
+                        sscanf(
+                            w.c_str(),
+                            "%04d-%02d-%02dT%02d:%02d:%02dZ",
+                            &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
+                            &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec
+                            ) != 6
+                ) && (
                     sscanf(
                         w.c_str(),
-                        "%04d-%02d-%02dT%02d:%02d:%02dZ",
+                        "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
                         &tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
-                        &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec
-                    ) != 6 )
+                        &tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec,
+                        &fraction
+                        ) != 7
+                    ) )
                 throw failed_conversion(OPKELE_CP_ "failed to sscanf()");
             tm_t.tm_mon--;
             tm_t.tm_year-=1900;
             time_t rv = mktime(&tm_t);
             if(rv==(time_t)-1)
                 throw failed_conversion(OPKELE_CP_ "failed to mktime()");
-            return rv;
+            return rv-timezone;
         }
 
         /*
          *
          */
 
         string url_encode(const string& str) {
             char * t = curl_escape(str.c_str(),str.length());
             if(!t)
                 throw failed_conversion(OPKELE_CP_ "failed to curl_escape()");
             string rv(t);
             curl_free(t);
             return rv;
         }
 
         string long_to_string(long l) {
             char rv[32];
             int r=snprintf(rv,sizeof(rv),"%ld",l);
             if(r<0 || r>=(int)sizeof(rv))
                 throw failed_conversion(OPKELE_CP_ "failed to snprintf()");
             return rv;
         }
 
         long string_to_long(const string& s) {