get rid of util_date.c/util_date.h and associated test program (26c677d4) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

include/util_date.h

deleted100644 → 0

+0 −114

Original line number	Diff line number	Diff line
		/* ====================================================================
		* The Apache Software License, Version 1.1
		*
		* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
		* reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		*
		* 3. The end-user documentation included with the redistribution,
		* if any, must include the following acknowledgment:
		* "This product includes software developed by the
		* Apache Software Foundation (http://www.apache.org/)."
		* Alternately, this acknowledgment may appear in the software itself,
		* if and wherever such third-party acknowledgments normally appear.
		*
		* 4. The names "Apache" and "Apache Software Foundation" must
		* not be used to endorse or promote products derived from this
		* software without prior written permission. For written
		* permission, please contact apache@apache.org.
		*
		* 5. Products derived from this software may not be called "Apache",
		* nor may "Apache" appear in their name, without prior written
		* permission of the Apache Software Foundation.
		*
		* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
		* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
		* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
		* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
		* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		* ====================================================================
		*
		* This software consists of voluntary contributions made by many
		* individuals on behalf of the Apache Software Foundation. For more
		* information on the Apache Software Foundation, please see
		* <http://www.apache.org/>.
		*
		* Portions of this software are based upon public domain software
		* originally written at the National Center for Supercomputing Applications,
		* University of Illinois, Urbana-Champaign.
		*/

		#ifndef APACHE_UTIL_DATE_H
		#define APACHE_UTIL_DATE_H

		#ifdef __cplusplus
		extern "C" {
		#endif

		/**
		* @package Apache date routines
		*/

		/*
		* util_date.h: prototypes for date parsing utility routines
		*/

		#include "apr_time.h"

		#define BAD_DATE (apr_time_t)0

		/**
		* Compare a string to a mask
		* @param data The string to compare
		* @mask Mask characters (arbitrary maximum is 256 characters, just in case):
		* <PRE>
		* @ - uppercase letter
		* $ - lowercase letter
		* & - hex digit
		* # - digit
		* ~ - digit or space
		* * - swallow remaining characters
		* <x> - exact match for any other character
		* </PRE>
		* @return 1 if the string matches, 0 otherwise
		* @deffunc int ap_checkmask(const char data, const char mask)
		*/
		AP_DECLARE(int) ap_checkmask(const char data, const char mask);

		/**
		* Parses an HTTP date in one of three standard forms:
		* <PRE>
		* Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123
		* Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
		* Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
		* </PRE>
		* @param date The date in one of the three formats above
		* @return the apr_time_t number of microseconds since 1 Jan 1970 GMT, or
		* 0 if this would be out of range or if the date is invalid.
		* @deffunc apr_time_t ap_parseHTTPdate(const char *date)
		*/
		AP_DECLARE(apr_time_t) ap_parseHTTPdate(const char *date);

		#ifdef __cplusplus
		}
		#endif

		#endif /* !APACHE_UTIL_DATE_H */

libhttpd.dsp

+0 −8

Original line number	Diff line number	Diff line
		@@ -357,14 +357,6 @@ SOURCE=.\include\util_charset.h
		# End Source File
		# Begin Source File

		SOURCE=.\server\util_date.c
		# End Source File
		# Begin Source File

		SOURCE=.\include\util_date.h
		# End Source File
		# Begin Source File

		SOURCE=.\include\util_ebcdic.h
		# End Source File
		# Begin Source File

server/Makefile.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ SUBDIRS = mpm
		LTLIBRARY_NAME = libmain.la
		LTLIBRARY_SOURCES = \
		test_char.h \
		config.c log.c main.c vhost.c util.c util_date.c \
		config.c log.c main.c vhost.c util.c \
		util_script.c util_md5.c util_cfgtree.c util_ebcdic.c \
		rfc1413.c connection.c listen.c \
		mpm_common.c util_charset.c util_debug.c util_xml.c \

server/util_date.c

deleted100644 → 0

+0 −306

Original line number	Diff line number	Diff line
		/* ====================================================================
		* The Apache Software License, Version 1.1
		*
		* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
		* reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		*
		* 3. The end-user documentation included with the redistribution,
		* if any, must include the following acknowledgment:
		* "This product includes software developed by the
		* Apache Software Foundation (http://www.apache.org/)."
		* Alternately, this acknowledgment may appear in the software itself,
		* if and wherever such third-party acknowledgments normally appear.
		*
		* 4. The names "Apache" and "Apache Software Foundation" must
		* not be used to endorse or promote products derived from this
		* software without prior written permission. For written
		* permission, please contact apache@apache.org.
		*
		* 5. Products derived from this software may not be called "Apache",
		* nor may "Apache" appear in their name, without prior written
		* permission of the Apache Software Foundation.
		*
		* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
		* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
		* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
		* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
		* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		* ====================================================================
		*
		* This software consists of voluntary contributions made by many
		* individuals on behalf of the Apache Software Foundation. For more
		* information on the Apache Software Foundation, please see
		* <http://www.apache.org/>.
		*
		* Portions of this software are based upon public domain software
		* originally written at the National Center for Supercomputing Applications,
		* University of Illinois, Urbana-Champaign.
		*/

		/*
		* util_date.c: date parsing utility routines
		* These routines are (hopefully) platform independent.
		*
		* 27 Oct 1996 Roy Fielding
		* Extracted (with many modifications) from mod_proxy.c and
		* tested with over 50,000 randomly chosen valid date strings
		* and several hundred variations of invalid date strings.
		*
		*/

		#include "apr.h"
		#include "apr_lib.h"

		#define APR_WANT_STRFUNC
		#include "apr_want.h"

		#if APR_HAVE_CTYPE_H
		#include <ctype.h>
		#endif

		#define CORE_PRIVATE

		#include "ap_config.h"
		#include "util_date.h"

		/*
		* Compare a string to a mask
		* Mask characters (arbitrary maximum is 256 characters, just in case):
		* @ - uppercase letter
		* $ - lowercase letter
		* & - hex digit
		* # - digit
		* ~ - digit or space
		* * - swallow remaining characters
		* <x> - exact match for any other character
		*/
		AP_DECLARE(int) ap_checkmask(const char data, const char mask)
		{
		int i;
		char d;

		for (i = 0; i < 256; i++) {
		d = data[i];
		switch (mask[i]) {
		case '\0':
		return (d == '\0');

		case '*':
		return 1;

		case '@':
		if (!apr_isupper(d))
		return 0;
		break;
		case '$':
		if (!apr_islower(d))
		return 0;
		break;
		case '#':
		if (!apr_isdigit(d))
		return 0;
		break;
		case '&':
		if (!apr_isxdigit(d))
		return 0;
		break;
		case '~':
		if ((d != ' ') && !apr_isdigit(d))
		return 0;
		break;
		default:
		if (mask[i] != d)
		return 0;
		break;
		}
		}
		return 0; /* We only get here if mask is corrupted (exceeds 256) */
		}


		/*
		* Parses an HTTP date in one of three standard forms:
		*
		* Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123
		* Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
		* Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
		*
		* and returns the time_t number of seconds since 1 Jan 1970 GMT, or
		* 0 if this would be out of range or if the date is invalid.
		*
		* The restricted HTTP syntax is
		*
		* HTTP-date = rfc1123-date \| rfc850-date \| asctime-date
		*
		* rfc1123-date = wkday "," SP date1 SP time SP "GMT"
		* rfc850-date = weekday "," SP date2 SP time SP "GMT"
		* asctime-date = wkday SP date3 SP time SP 4DIGIT
		*
		* date1 = 2DIGIT SP month SP 4DIGIT
		* ; day month year (e.g., 02 Jun 1982)
		* date2 = 2DIGIT "-" month "-" 2DIGIT
		* ; day-month-year (e.g., 02-Jun-82)
		* date3 = month SP ( 2DIGIT \| ( SP 1DIGIT ))
		* ; month day (e.g., Jun 2)
		*
		* time = 2DIGIT ":" 2DIGIT ":" 2DIGIT
		* ; 00:00:00 - 23:59:59
		*
		* wkday = "Mon" \| "Tue" \| "Wed"
		* \| "Thu" \| "Fri" \| "Sat" \| "Sun"
		*
		* weekday = "Monday" \| "Tuesday" \| "Wednesday"
		* \| "Thursday" \| "Friday" \| "Saturday" \| "Sunday"
		*
		* month = "Jan" \| "Feb" \| "Mar" \| "Apr"
		* \| "May" \| "Jun" \| "Jul" \| "Aug"
		* \| "Sep" \| "Oct" \| "Nov" \| "Dec"
		*
		* However, for the sake of robustness (and Netscapeness), we ignore the
		* weekday and anything after the time field (including the timezone).
		*
		* This routine is intended to be very fast; 10x faster than using sscanf.
		*
		* Originally from Andrew Daviel <andrew@vancouver-webpages.com>, 29 Jul 96
		* but many changes since then.
		*
		*/
		AP_DECLARE(apr_time_t) ap_parseHTTPdate(const char *date)
		{
		apr_exploded_time_t ds;
		apr_time_t result;
		int mint, mon;
		const char monstr, timstr;
		static const int months[12] =
		{
		('J' << 16) \| ('a' << 8) \| 'n', ('F' << 16) \| ('e' << 8) \| 'b',
		('M' << 16) \| ('a' << 8) \| 'r', ('A' << 16) \| ('p' << 8) \| 'r',
		('M' << 16) \| ('a' << 8) \| 'y', ('J' << 16) \| ('u' << 8) \| 'n',
		('J' << 16) \| ('u' << 8) \| 'l', ('A' << 16) \| ('u' << 8) \| 'g',
		('S' << 16) \| ('e' << 8) \| 'p', ('O' << 16) \| ('c' << 8) \| 't',
		('N' << 16) \| ('o' << 8) \| 'v', ('D' << 16) \| ('e' << 8) \| 'c'};

		if (!date)
		return BAD_DATE;

		while (date && apr_isspace(date)) /* Find first non-whitespace char */
		++date;

		if (*date == '\0')
		return BAD_DATE;

		if ((date = strchr(date, ' ')) == NULL) /* Find space after weekday */
		return BAD_DATE;

		++date; /* Now pointing to first char after space, which should be */
		/* start of the actual date information for all 3 formats. */

		if (ap_checkmask(date, "## @$$ #### ##:##:## ")) { / RFC 1123 format */
		ds.tm_year = ((date[7] - '0') * 10 + (date[8] - '0') - 19) * 100;
		if (ds.tm_year < 0)
		return BAD_DATE;

		ds.tm_year += ((date[9] - '0') * 10) + (date[10] - '0');

		ds.tm_mday = ((date[0] - '0') * 10) + (date[1] - '0');

		monstr = date + 3;
		timstr = date + 12;
		}
		else if (ap_checkmask(date, "##-@$$-## ##:##:## ")) { / RFC 850 format */
		ds.tm_year = ((date[7] - '0') * 10) + (date[8] - '0');
		if (ds.tm_year < 70)
		ds.tm_year += 100;

		ds.tm_mday = ((date[0] - '0') * 10) + (date[1] - '0');

		monstr = date + 3;
		timstr = date + 10;
		}
		else if (ap_checkmask(date, "@$$ ~# ##:##:## ####")) { / asctime format */
		ds.tm_year = ((date[16] - '0') * 10 + (date[17] - '0') - 19) * 100;
		if (ds.tm_year < 0)
		return BAD_DATE;

		ds.tm_year += ((date[18] - '0') * 10) + (date[19] - '0');

		if (date[4] == ' ')
		ds.tm_mday = 0;
		else
		ds.tm_mday = (date[4] - '0') * 10;

		ds.tm_mday += (date[5] - '0');

		monstr = date;
		timstr = date + 7;
		}
		else
		return BAD_DATE;

		if (ds.tm_mday <= 0 \|\| ds.tm_mday > 31)
		return BAD_DATE;

		ds.tm_hour = ((timstr[0] - '0') * 10) + (timstr[1] - '0');
		ds.tm_min = ((timstr[3] - '0') * 10) + (timstr[4] - '0');
		ds.tm_sec = ((timstr[6] - '0') * 10) + (timstr[7] - '0');

		if ((ds.tm_hour > 23) \|\| (ds.tm_min > 59) \|\| (ds.tm_sec > 61))
		return BAD_DATE;

		mint = (monstr[0] << 16) \| (monstr[1] << 8) \| monstr[2];
		for (mon = 0; mon < 12; mon++)
		if (mint == months[mon])
		break;
		if (mon == 12)
		return BAD_DATE;

		if ((ds.tm_mday == 31) && (mon == 3 \|\| mon == 5 \|\| mon == 8 \|\| mon == 10))
		return BAD_DATE;

		/* February gets special check for leapyear */

		if ((mon == 1) &&
		((ds.tm_mday > 29)
		\|\| ((ds.tm_mday == 29)
		&& ((ds.tm_year & 3)
		\|\| (((ds.tm_year % 100) == 0)
		&& (((ds.tm_year % 400) != 100)))))))
		return BAD_DATE;

		ds.tm_mon = mon;

		/* ap_mplode_time uses tm_usec and tm_gmtoff fields, but they haven't
		* been set yet.
		* It should be safe to just zero out these values.
		* tm_usec is the number of microseconds into the second. HTTP only
		* cares about second granularity.
		* tm_gmtoff is the number of seconds off of GMT the time is. By
		* definition all times going through this function are in GMT, so this
		* is zero.
		*/
		ds.tm_usec = 0;
		ds.tm_gmtoff = 0;
		if (apr_implode_time(&result, &ds) != APR_SUCCESS)
		return BAD_DATE;

		return result;
		}

test/test_date.c

deleted100644 → 0

+0 −180

Original line number	Diff line number	Diff line
		/* This program tests the parseHTTPdate routine in ../main/util_date.c.
		*
		* It is only semiautomated in that I would run it, modify the code to
		* use a different algorithm or seed, recompile and run again, etc.
		* Obviously it should use an argument for that, but I never got around
		* to changing the implementation.
		*
		* gcc -g -O2 -I../main -o test_date ../main/util_date.o test_date.c
		* test_date \| egrep '^No '
		*
		* Roy Fielding, 1996
		*/
		#define AP_DECLARE(x) x

		#include <stdio.h>
		#include <stdlib.h>
		#include "util_date.h"

		static const long year2secs[] = {
		0L, /* 1970 */
		31536000L, /* 1971 */
		63072000L, /* 1972 */
		94694400L, /* 1973 */
		126230400L, /* 1974 */
		157766400L, /* 1975 */
		189302400L, /* 1976 */
		220924800L, /* 1977 */
		252460800L, /* 1978 */
		283996800L, /* 1979 */
		315532800L, /* 1980 */
		347155200L, /* 1981 */
		378691200L, /* 1982 */
		410227200L, /* 1983 */
		441763200L, /* 1984 */
		473385600L, /* 1985 */
		504921600L, /* 1986 */
		536457600L, /* 1987 */
		567993600L, /* 1988 */
		599616000L, /* 1989 */
		631152000L, /* 1990 */
		662688000L, /* 1991 */
		694224000L, /* 1992 */
		725846400L, /* 1993 */
		757382400L, /* 1994 */
		788918400L, /* 1995 */
		820454400L, /* 1996 */
		852076800L, /* 1997 */
		883612800L, /* 1998 */
		915148800L, /* 1999 */
		946684800L, /* 2000 */
		978307200L, /* 2001 */
		1009843200L, /* 2002 */
		1041379200L, /* 2003 */
		1072915200L, /* 2004 */
		1104537600L, /* 2005 */
		1136073600L, /* 2006 */
		1167609600L, /* 2007 */
		1199145600L, /* 2008 */
		1230768000L, /* 2009 */
		1262304000L, /* 2010 */
		1293840000L, /* 2011 */
		1325376000L, /* 2012 */
		1356998400L, /* 2013 */
		1388534400L, /* 2014 */
		1420070400L, /* 2015 */
		1451606400L, /* 2016 */
		1483228800L, /* 2017 */
		1514764800L, /* 2018 */
		1546300800L, /* 2019 */
		1577836800L, /* 2020 */
		1609459200L, /* 2021 */
		1640995200L, /* 2022 */
		1672531200L, /* 2023 */
		1704067200L, /* 2024 */
		1735689600L, /* 2025 */
		1767225600L, /* 2026 */
		1798761600L, /* 2027 */
		1830297600L, /* 2028 */
		1861920000L, /* 2029 */
		1893456000L, /* 2030 */
		1924992000L, /* 2031 */
		1956528000L, /* 2032 */
		1988150400L, /* 2033 */
		2019686400L, /* 2034 */
		2051222400L, /* 2035 */
		2082758400L, /* 2036 */
		2114380800L, /* 2037 */
		2145916800L /* 2038 */
		};

		const char month_snames[12][4] = {
		"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
		};

		void gm_timestr_822(char *ts, time_t sec)
		{
		static const char *const days[7]=
		{"Sun","Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
		struct tm *tms;

		tms = gmtime(&sec);

		sprintf(ts, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", days[tms->tm_wday],
		tms->tm_mday, month_snames[tms->tm_mon], tms->tm_year + 1900,
		tms->tm_hour, tms->tm_min, tms->tm_sec);
		}

		void gm_timestr_850(char *ts, time_t sec)
		{
		static const char *const days[7]=
		{"Sunday","Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
		struct tm *tms;
		int year;

		tms = gmtime(&sec);

		year = tms->tm_year;
		if (year >= 100) year -= 100;

		sprintf(ts, "%s, %.2d-%s-%.2d %.2d:%.2d:%.2d GMT", days[tms->tm_wday],
		tms->tm_mday, month_snames[tms->tm_mon], year,
		tms->tm_hour, tms->tm_min, tms->tm_sec);
		}

		void gm_timestr_ccc(char *ts, time_t sec)
		{
		static const char *const days[7]=
		{"Sun","Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
		struct tm *tms;

		tms = gmtime(&sec);

		sprintf(ts, "%s %s %2d %.2d:%.2d:%.2d %d", days[tms->tm_wday],
		month_snames[tms->tm_mon], tms->tm_mday,
		tms->tm_hour, tms->tm_min, tms->tm_sec, tms->tm_year + 1900);
		}

		int main (void)
		{
		int year, i;
		time_t guess;
		time_t offset = 0;
		/* time_t offset = 0; */
		/* time_t offset = ((31 + 28) * 24 * 3600) - 1; */
		time_t secstodate, newsecs;
		char datestr[50];

		for (year = 1970; year < 2038; ++year) {
		secstodate = (time_t)year2secs[year - 1970] + offset;
		gm_timestr_822(datestr, secstodate);
		newsecs = parseHTTPdate(datestr);
		if (secstodate == newsecs)
		printf("Yes %4d %11ld %s\n", year, (long)secstodate, datestr);
		else if (newsecs == BAD_DATE)
		printf("No %4d %11ld %11ld %s\n", year, (long)secstodate,
		(long)newsecs, datestr);
		else
		printf("No* %4d %11ld %11ld %s\n", year, (long)secstodate,
		(long)newsecs, datestr);
		}

		srand48(978245L);

		for (i = 0; i < 10000; ++i) {
		guess = (time_t)mrand48();
		if (guess < 0) guess *= -1;
		secstodate = guess + offset;
		gm_timestr_822(datestr, secstodate);
		newsecs = parseHTTPdate(datestr);
		if (secstodate == newsecs)
		printf("Yes %11ld %s\n", (long)secstodate, datestr);
		else if (newsecs == BAD_DATE)
		printf("No %11ld %11ld %s\n", (long)secstodate,
		(long)newsecs, datestr);
		else
		printf("No* %11ld %11ld %s\n", (long)secstodate,
		(long)newsecs, datestr);
		}
		exit(0);
		}