commit 1937cf6a9525d2d97476b2693731ee7fcb0e3dc9 Author: Pyfisch Date: Sun Oct 2 22:29:41 2016 +0200 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a9d37c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +target +Cargo.lock diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..ba4d338 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "httpdate" +version = "0.1.0" +authors = ["Pyfisch "] +license = "MIT/Apache-2.0" +description = "HTTP date parsing and formatting" +keywords = ["http", "date", "time", "simple", "timestamp"] + +[dependencies] diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000..cd482d8 --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,201 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all +other entities that control, are controlled by, or are under common +control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the +direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or +Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright owner +or by an individual or Legal Entity authorized to submit on behalf of +the copyright owner. For the purposes of this definition, "submitted" +means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, +and issue tracking systems that are managed by, or on behalf of, the +Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work, +where such license applies only to those patent claims licensable +by such Contributor that are necessarily infringed by their +Contribution(s) alone or by combination of their Contribution(s) +with the Work to which such Contribution(s) was submitted. If You +institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work +or a Contribution incorporated within the Work constitutes direct +or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You +meet the following conditions: + +(a) You must give any other recipients of the Work or +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices +stating that You changed the files; and + +(c) You must retain, in the Source form of any Derivative Works +that You distribute, all copyright, patent, trademark, and +attribution notices from the Source form of the Work, +excluding those notices that do not pertain to any part of +the Derivative Works; and + +(d) If the Work includes a "NOTICE" text file as part of its +distribution, then any Derivative Works that You distribute must +include a readable copy of the attribution notices contained +within such NOTICE file, excluding those notices that do not +pertain to any part of the Derivative Works, in at least one +of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or +documentation, if provided along with the Derivative Works; or, +within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and +do not modify the License. You may add Your own attribution +notices within Derivative Works that You distribute, alongside +or as an addendum to the NOTICE text from the Work, provided +that such additional attribution notices cannot be construed +as modifying the License. + +You may add Your own copyright statement to Your modifications and +may provide additional or different license terms and conditions +for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, +reproduction, and distribution of the Work otherwise complies with +the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..8819964 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,19 @@ +Copyright (c) 2016 Pyfisch + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/datetime.rs b/src/datetime.rs new file mode 100644 index 0000000..fa88e35 --- /dev/null +++ b/src/datetime.rs @@ -0,0 +1,272 @@ +use std::fmt::{self, Display, Formatter}; +use std::str::FromStr; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; + +#[derive(Debug)] +pub struct DateTime { + /// 0...59 + sec: u8, + /// 0...59 + min: u8, + /// 0...23 + hour: u8, + /// 1...31 + day: u8, + /// 1...12 + mon: u8, + /// 1000...9999 + year: u16, + /// 1...7 + wday: u8, +} + +impl From for DateTime { + fn from(v: SystemTime) -> DateTime { + let secs_since_epoch = v.duration_since(UNIX_EPOCH).unwrap().as_secs(); + let mut days = secs_since_epoch / 86400; + let wday = ((days + 3) % 7) + 1; + let secs_of_day = secs_since_epoch % 86400; + let mut year = 1970; + loop { + let ydays = if is_leap_year(year) { + 366 + } else { + 365 + }; + if days >= ydays { + days -= ydays; + year += 1; + } else { + break; + } + } + let mut months = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; + if is_leap_year(year) { + months[1] += 1; + } + let mut mon = 0; + for mon_len in months.iter() { + mon += 1; + if days < *mon_len { + break; + } + days -= *mon_len; + } + let mday = days + 1; + + DateTime { + sec: (secs_of_day % 60) as u8, + min: ((secs_of_day % 3600) / 60) as u8, + hour: (secs_of_day / 3600) as u8, + day: mday as u8, + mon: mon as u8, + year: year, + wday: wday as u8, + } + } +} + +impl From for SystemTime { + fn from(v: DateTime) -> SystemTime { + let leap_years = ((v.year - 1) - 1968) / 4 + - ((v.year - 1) - 1900) / 100 + + ((v.year - 1) - 1600) / 400; + let mut ydays = match v.mon { + 1 => 0, + 2 => 31, + 3 => 59, + 4 => 90, + 5 => 120, + 6 => 151, + 7 => 181, + 8 => 212, + 9 => 243, + 10 => 273, + 11 => 304, + 12 => 334, + _ => unreachable!(), + } + v.day as u64 - 1; + if is_leap_year(v.year) && v.mon > 2 { + ydays += 1; + } + let days = (v.year as u64 - 1970) * 365 + leap_years as u64 + ydays; + UNIX_EPOCH + Duration::from_secs(v.sec as u64 + + v.min as u64 * 60 + + v.hour as u64 * 3600 + + days * 86400) + } +} + +impl FromStr for DateTime { + type Err = (); + + fn from_str(s: &str) -> Result { + let s = s.trim(); + parse_imf_fixdate(s) + .or_else(|_| parse_rfc850_date(s)) + .or_else(|_| parse_asctime(s)) + } +} + +impl Display for DateTime { + fn fmt(&self, f: &mut Formatter) -> fmt::Result { + write!(f, "{wday}, {day:02} {mon} {year} {hour:02}:{min:02}:{sec:02} GMT", + sec=self.sec, + min=self.min, + hour=self.hour, + day=self.day, + mon=match self.mon { + 1 => "Jan", + 2 => "Feb", + 3 => "Mar", + 4 => "Apr", + 5 => "Mai", + 6 => "Jun", + 7 => "Jul", + 8 => "Aug", + 9 => "Sep", + 10 => "Oct", + 11 => "Nov", + 12 => "Dec", + _ => unreachable!(), + }, + year=self.year, + wday=match self.wday { + 1 => "Mon", + 2 => "Tue", + 3 => "Wed", + 4 => "Thu", + 5 => "Fri", + 6 => "Sat", + 7 => "Sun", + _ => unreachable!(), + }, + ) + } +} + +fn parse_imf_fixdate(s: &str) -> Result { + if s.len() != 29 || &s[25..] != " GMT" { + return Err(()) + } + Ok(DateTime { + sec: try!(s[23..25].parse().map_err(|_| ())), + min: try!(s[20..22].parse().map_err(|_| ())), + hour: try!(s[17..19].parse().map_err(|_| ())), + day: try!(s[5..7].parse().map_err(|_| ())), + mon: match &s[7..12] { + " Jan " => 1, + " Feb " => 2, + " Mar " => 3, + " Apr " => 4, + " Mai " => 5, + " Jun " => 6, + " Jul " => 7, + " Aug " => 8, + " Sep " => 9, + " Oct " => 10, + " Nov " => 11, + " Dec " => 12, + _ => return Err(()), + }, + year: try!(s[12..16].parse().map_err(|_| ())), + wday: match &s[..5] { + "Mon, " => 1, + "Tue, " => 2, + "Wed, " => 3, + "Thu, " => 4, + "Fri, " => 5, + "Sat, " => 6, + "Sun, " => 7, + _ => return Err(()), + }, + }) +} + +fn parse_rfc850_date(s: &str) -> Result { + if !s.ends_with(" GMT") { + return Err(()) + } + let (wday, s) = if s.starts_with("Monday, ") { (1, &s[8..]) } + else if s.starts_with("Tuesday, ") { (2, &s[9..]) } + else if s.starts_with("Wednesday, ") { (3, &s[11..]) } + else if s.starts_with("Thursday, ") { (4, &s[10..]) } + else if s.starts_with("Friday, ") { (5, &s[8..]) } + else if s.starts_with("Saturday, ") { (6, &s[10..]) } + else if s.starts_with("Sunday, ") { (7, &s[8..]) } + else { return Err(()); }; + if s.len() != 22 { + return Err(()) + } + let mut year = try!(s[7..9].parse::().map_err(|_| ())); + if year < 80 { + year += 2000; + } else { + year += 1900; + } + Ok(DateTime { + sec: try!(s[16..18].parse().map_err(|_| ())), + min: try!(s[13..15].parse().map_err(|_| ())), + hour: try!(s[10..12].parse().map_err(|_| ())), + day: try!(s[0..2].parse().map_err(|_| ())), + mon: match &s[2..7] { + "-Jan-" => 1, + "-Feb-" => 2, + "-Mar-" => 3, + "-Apr-" => 4, + "-Mai-" => 5, + "-Jun-" => 6, + "-Jul-" => 7, + "-Aug-" => 8, + "-Sep-" => 9, + "-Oct-" => 10, + "-Nov-" => 11, + "-Dec-" => 12, + _ => return Err(()), + }, + year: year, + wday: wday, + }) +} + +fn parse_asctime(s: &str) -> Result { + if s.len() != 24 { + return Err(()) + } + Ok(DateTime { + sec: try!(s[17..19].parse().map_err(|_| ())), + min: try!(s[14..16].parse().map_err(|_| ())), + hour: try!(s[11..13].parse().map_err(|_| ())), + day: try!(s[8..10].trim_left().parse().map_err(|_| ())), + mon: match &s[4..8] { + "Jan " => 1, + "Feb " => 2, + "Mar " => 3, + "Apr " => 4, + "Mai " => 5, + "Jun " => 6, + "Jul " => 7, + "Aug " => 8, + "Sep " => 9, + "Oct " => 10, + "Nov " => 11, + "Dec " => 12, + _ => return Err(()), + }, + year: try!(s[20..24].parse().map_err(|_| ())), + wday: match &s[0..4] { + "Mon " => 1, + "Tue " => 2, + "Wed " => 3, + "Thu " => 4, + "Fri " => 5, + "Sat " => 6, + "Sun " => 7, + _ => return Err(()), + }, + }) +} + +fn is_leap_year(y: u16) -> bool { + y % 4 == 0 && (!(y % 100 == 0) || y % 400 == 0) +} diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..3baf429 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,83 @@ +//! Date and time utils for HTTP. +//! +//! Multiple HTTP header fields store timestamps. +//! For example a response created on May 15, 2015 may contain the header +//! `Date: Fri, 15 May 2015 15:34:21 GMT`. Since the timestamp does not +//! contain any timezone or leap second information it is equvivalent to +//! writing 1431696861 Unix time. Rust’s `SystemTime` is used to store +//! these timestamps. +//! +//! This crate provides two public functions: +//! * `parse_http_date` to parse a HTTP datetime string to a system time +//! * `fmt_http_date` to format a system time to a IMF-fixdate + +use std::time::SystemTime; + +use datetime::DateTime; + +mod datetime; + +/// Parse a date from an HTTP header field. +/// +/// Supports the preferred IMF-fixdate and the legacy RFC 805 and +/// ascdate formats. Two digit years are mapped to dates between +/// 1980 and 2079. +pub fn parse_http_date(s: &str) -> Result { + s.parse::().map(|d| d.into()) +} + +/// Format a date to be used in a HTTP header field. +pub fn fmt_http_date(d: SystemTime) -> String { + format!("{}", DateTime::from(d)) +} + +#[cfg(test)] +mod tests { + use std::time::{Duration, UNIX_EPOCH}; + + use super::{parse_http_date, fmt_http_date}; + + #[test] + fn test_rfc_example() { + let d = UNIX_EPOCH + Duration::from_secs(784111777); + assert_eq!(d, parse_http_date("Sun, 06 Nov 1994 08:49:37 GMT").unwrap()); + assert_eq!(d, parse_http_date("Sunday, 06-Nov-94 08:49:37 GMT").unwrap()); + assert_eq!(d, parse_http_date("Sun Nov 6 08:49:37 1994").unwrap()); + } + + #[test] + fn test2() { + let d = UNIX_EPOCH + Duration::from_secs(1475419451); + assert_eq!(d, parse_http_date("Sun, 02 Oct 2016 14:44:11 GMT").unwrap()); + } + + #[test] + fn test3() { + let mut d = UNIX_EPOCH; + assert_eq!(d, parse_http_date("Thu, 01 Jan 1970 00:00:00 GMT").unwrap()); + d += Duration::from_secs(3600); + assert_eq!(d, parse_http_date("Thu, 01 Jan 1970 01:00:00 GMT").unwrap()); + d += Duration::from_secs(86400); + assert_eq!(d, parse_http_date("Fri, 02 Jan 1970 01:00:00 GMT").unwrap()); + d += Duration::from_secs(2592000); + assert_eq!(d, parse_http_date("Sun, 01 Feb 1970 01:00:00 GMT").unwrap()); + d += Duration::from_secs(2592000); + assert_eq!(d, parse_http_date("Tue, 03 Mar 1970 01:00:00 GMT").unwrap()); + d += Duration::from_secs(31536005); + assert_eq!(d, parse_http_date("Wed, 03 Mar 1971 01:00:05 GMT").unwrap()); + d += Duration::from_secs(15552000); + assert_eq!(d, parse_http_date("Mon, 30 Aug 1971 01:00:05 GMT").unwrap()); + d += Duration::from_secs(6048000); + assert_eq!(d, parse_http_date("Mon, 08 Nov 1971 01:00:05 GMT").unwrap()); + d += Duration::from_secs(864000000); + assert_eq!(d, parse_http_date("Fri, 26 Mar 1999 01:00:05 GMT").unwrap()); + } + + #[test] + fn test_fmt() { + let d = UNIX_EPOCH; + assert_eq!(fmt_http_date(d), "Thu, 01 Jan 1970 00:00:00 GMT"); + let d = UNIX_EPOCH + Duration::from_secs(1475419451); + assert_eq!(fmt_http_date(d), "Sun, 02 Oct 2016 14:44:11 GMT"); + } +}