diff --git a/include/ourmd5.h b/include/ourmd5.h new file mode 100644 index 0000000..698c995 --- /dev/null +++ b/include/ourmd5.h @@ -0,0 +1,91 @@ +/* + Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ +/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321, whose + text is available at + http://www.ietf.org/rfc/rfc1321.txt + The code is derived from the text of the RFC, including the test suite + (section A.5) but excluding the rest of Appendix A. It does not include + any code or documentation that is identified in the RFC as being + copyrighted. + + The original and principal author of md5.h is L. Peter Deutsch + . Other authors are noted in the change history + that follows (in reverse chronological order): + + 2002-04-13 lpd Removed support for non-ANSI compilers; removed + references to Ghostscript; clarified derivation from RFC 1321; + now handles byte order either statically or dynamically. + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); + added conditionalization for C++ compilation from Martin + Purschke . + 1999-05-03 lpd Original version. + */ + +#ifndef md5_INCLUDED +# define md5_INCLUDED + +/* + * This package supports both compile-time and run-time determination of CPU + * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be + * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is + * defined as non-zero, the code will be compiled to run only on big-endian + * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to + * run on either big- or little-endian CPUs, but will run slightly less + * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. + */ + +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ + +/* Define the state of the MD5 Algorithm. */ +typedef struct md5_state_s { + md5_word_t count[2]; /* message length in bits, lsw first */ + md5_word_t abcd[4]; /* digest buffer */ + md5_byte_t buf[64]; /* accumulate block */ +} md5_state_t; + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Initialize the algorithm. */ +void md5_init(md5_state_t *pms); + +/* Append a string to the message. */ +void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); + +/* Finish the message and return the digest. */ +void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); + +#ifdef __cplusplus +} /* end extern "C" */ +#endif + +#endif /* md5_INCLUDED */ diff --git a/include/phoned.h b/include/phoned.h index 64014a1..cef80a7 100644 --- a/include/phoned.h +++ b/include/phoned.h @@ -3,7 +3,7 @@ * (C)2005, Dan Ponte * BSDL w/ advert. */ -/* $Amigan: phoned/include/phoned.h,v 1.20 2005/06/19 04:45:33 dcp1990 Exp $ */ +/* $Amigan: phoned/include/phoned.h,v 1.21 2005/06/20 01:39:48 dcp1990 Exp $ */ #include /* fugly, I know... */ #define VERSION "0.1" #define LOGFILE "-" @@ -99,6 +99,12 @@ typedef struct cnd_t { struct cnd_t* last; struct cnd_t* next; } cond_t; +typedef struct logn_t { + char *name; + time_t logintime; + struct logn_t *last; + struct logn_t *next; +} login_t; typedef enum modes_t { ok, ring, @@ -125,6 +131,7 @@ typedef struct si_t { short freeit; FILE* fpo; int fd; + login_t *l; } state_info_t; #ifdef HAVE_INET_INCS @@ -171,6 +178,13 @@ void cid_handle(cid_t *c); void awaken_sel(void); void modem_wake(void); void fillset(void); +login_t *check_logged_in(char *loginna, login_t *top); +short log_in_user(char *loginna, char *pass, login_t **lnt); +login_t *add_to_login_list(char *loginna, login_t **toppt); +void log_out_user(char *loginna, login_t **toppt); +void free_login(login_t *t, short traverse); +void flush_logins(void); +short db_check_crend(char *loginna, char *pass); /* old stuff... void modem_pickup(void); void modem_hangup(void); diff --git a/phoned/Makefile b/phoned/Makefile index 9e38ef9..79c6998 100644 --- a/phoned/Makefile +++ b/phoned/Makefile @@ -1,6 +1,6 @@ # cnd Makefile # (C)2005, Dan Ponte -# $Amigan: phoned/phoned/Makefile,v 1.12 2005/06/18 20:13:06 dcp1990 Exp $ +# $Amigan: phoned/phoned/Makefile,v 1.13 2005/06/20 01:39:50 dcp1990 Exp $ include ../global.mk # basic stuff. we append for a reason. CPPFLAGS+=-I../include -DDEBUG -DYY_NO_UNPUT @@ -8,8 +8,8 @@ CFLAGS+=-g -Wall -W -ansi ${CPPFLAGS} -pthread LDFLAGS+=-lutil -lpcre -lsqlite3 # keep these up to date. MAINBIN=phoned -SRCS=main.c init.c log.c cfg.c socket.c y.tab.c lex.yy.c signals.c cid.c modem.c notify.c filters.c remote.c db.c -OBJS=main.o init.o log.o cfg.o socket.o y.tab.o lex.yy.o signals.o cid.o modem.o notify.o filters.o remote.o db.o \ +SRCS=main.c init.c log.c cfg.c socket.c y.tab.c lex.yy.c signals.c cid.c modem.c notify.c filters.c remote.c db.c md5.c +OBJS=main.o init.o log.o cfg.o socket.o y.tab.o lex.yy.o signals.o cid.o modem.o notify.o filters.o remote.o db.o md5.o \ modems/libmodems.a OHDRS=y.tab.h CLEANFILES=y.tab.c y.tab.h lex.yy.c diff --git a/phoned/db.c b/phoned/db.c index f5c2a74..aedda7c 100644 --- a/phoned/db.c +++ b/phoned/db.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Amigan: phoned/phoned/db.c,v 1.5 2005/06/19 04:46:15 dcp1990 Exp $ */ +/* $Amigan: phoned/phoned/db.c,v 1.6 2005/06/20 01:39:50 dcp1990 Exp $ */ #include #include #include @@ -37,6 +37,7 @@ #include #include +#include #define USERS_TABLE "users" #define CALLS_TABLE "calls" @@ -143,6 +144,53 @@ short db_destroy(void) /* stuff that does stuff */ +short db_check_crend(loginna, pass) + char *loginna; + char *pass; /* not md5'd yet */ +{ + int rc; + char *sql; + md5_state_t state; + md5_byte_t digest[16]; + const char *tail; + char pmd5[20]; + int di; + const unsigned char *lres, *pres; + sqlite3_stmt *cst; + md5_init(&state); + md5_append(&state, (const md5_byte_t *)pass, strlen(pass)); + md5_finish(&state, digest); + for(di = 0; di < 16; ++di) + sprintf(pmd5 + di * 2, "%02x", digest[di]); + lprintf(debug, "Digest came out to %s\n", pmd5); + sql = sqlite3_mprintf("SELECT login,passmd5 FROM " USERS_TABLE " WHERE login=='%q' AND passmd5=='%q'", loginna, pmd5); + pthread_mutex_lock(&dbmx); + rc = sqlite3_prepare(db, sql, strlen(sql), &cst, &tail); + sqlite3_free(sql); + if(rc != SQLITE_OK) { + lprintf(error, "db_check_crend: error prepare: %s\n", sqlite3_errmsg(db)); + pthread_mutex_unlock(&dbmx); + return 0; + } + di = 0; + while((rc = sqlite3_step(cst)) == SQLITE_ROW) { + lres = sqlite3_column_text(cst, 0); + pres = sqlite3_column_text(cst, 1); + if(strcmp(lres, loginna) == 0 && strcasecmp(lres, pmd5) == 0) { + di = 1; + break; + } + } + if(rc != SQLITE_OK && rc != SQLITE_DONE && rc != SQLITE_ROW) { + lprintf(error, "db_check_crend: error step: %s\n", sqlite3_errmsg(db)); + pthread_mutex_unlock(&dbmx); + return 0; + } + sqlite3_finalize(cst); + pthread_mutex_unlock(&dbmx); + if(di) return 1; + return 0; +} short db_add_call(c, t) cid_t *c; time_t t; diff --git a/phoned/init.c b/phoned/init.c index e5fca02..c571477 100644 --- a/phoned/init.c +++ b/phoned/init.c @@ -34,6 +34,7 @@ void shutd(whatdone) unlink(SOCKETFILE); if(whatdone & WD_MODEM) modem_wake(); flush_lists(); + flush_logins(); free_condition(topcond, 0x1); if(whatdone & WD_DBINIT) db_destroy(); pthread_mutex_lock(&logfmx); diff --git a/phoned/md5.c b/phoned/md5.c new file mode 100644 index 0000000..5b1afe8 --- /dev/null +++ b/phoned/md5.c @@ -0,0 +1,381 @@ +/* + Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ +/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321, whose + text is available at + http://www.ietf.org/rfc/rfc1321.txt + The code is derived from the text of the RFC, including the test suite + (section A.5) but excluding the rest of Appendix A. It does not include + any code or documentation that is identified in the RFC as being + copyrighted. + + The original and principal author of md5.c is L. Peter Deutsch + . Other authors are noted in the change history + that follows (in reverse chronological order): + + 2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order + either statically or dynamically; added missing #include + in library. + 2002-03-11 lpd Corrected argument list for main(), and added int return + type, in test program and T value program. + 2002-02-21 lpd Added missing #include in test program. + 2000-07-03 lpd Patched to eliminate warnings about "constant is + unsigned in ANSI C, signed in traditional"; made test program + self-checking. + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). + 1999-05-03 lpd Original version. + */ + +#include +#include + +#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ +#ifdef ARCH_IS_BIG_ENDIAN +# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1) +#else +# define BYTE_ORDER 0 +#endif + +#define T_MASK ((md5_word_t)~0) +#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87) +#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9) +#define T3 0x242070db +#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111) +#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050) +#define T6 0x4787c62a +#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec) +#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe) +#define T9 0x698098d8 +#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850) +#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e) +#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841) +#define T13 0x6b901122 +#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c) +#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71) +#define T16 0x49b40821 +#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d) +#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf) +#define T19 0x265e5a51 +#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855) +#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2) +#define T22 0x02441453 +#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e) +#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437) +#define T25 0x21e1cde6 +#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829) +#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278) +#define T28 0x455a14ed +#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa) +#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07) +#define T31 0x676f02d9 +#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375) +#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd) +#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e) +#define T35 0x6d9d6122 +#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3) +#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb) +#define T38 0x4bdecfa9 +#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f) +#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f) +#define T41 0x289b7ec6 +#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805) +#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a) +#define T44 0x04881d05 +#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6) +#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a) +#define T47 0x1fa27cf8 +#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a) +#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb) +#define T50 0x432aff97 +#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58) +#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6) +#define T53 0x655b59c3 +#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d) +#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82) +#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e) +#define T57 0x6fa87e4f +#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f) +#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb) +#define T60 0x4e0811a1 +#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d) +#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca) +#define T63 0x2ad7d2bb +#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) + + +static void +md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) +{ + md5_word_t + a = pms->abcd[0], b = pms->abcd[1], + c = pms->abcd[2], d = pms->abcd[3]; + md5_word_t t; +#if BYTE_ORDER > 0 + /* Define storage only for big-endian CPUs. */ + md5_word_t X[16]; +#else + /* Define storage for little-endian or both types of CPUs. */ + md5_word_t xbuf[16]; + const md5_word_t *X; +#endif + + { +#if BYTE_ORDER == 0 + /* + * Determine dynamically whether this is a big-endian or + * little-endian machine, since we can use a more efficient + * algorithm on the latter. + */ + static const int w = 1; + + if (*((const md5_byte_t *)&w)) /* dynamic little-endian */ +#endif +#if BYTE_ORDER <= 0 /* little-endian */ + { + /* + * On little-endian machines, we can process properly aligned + * data without copying it. + */ + if (!((data - (const md5_byte_t *)0) & 3)) { + /* data are properly aligned */ + X = (const md5_word_t *)data; + } else { + /* not aligned */ + memcpy(xbuf, data, 64); + X = xbuf; + } + } +#endif +#if BYTE_ORDER == 0 + else /* dynamic big-endian */ +#endif +#if BYTE_ORDER >= 0 /* big-endian */ + { + /* + * On big-endian machines, we must arrange the bytes in the + * right order. + */ + const md5_byte_t *xp = data; + int i; + +# if BYTE_ORDER == 0 + X = xbuf; /* (dynamic only) */ +# else +# define xbuf X /* (static only) */ +# endif + for (i = 0; i < 16; ++i, xp += 4) + xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); + } +#endif + } + +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) + + /* Round 1. */ + /* Let [abcd k s i] denote the operation + a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */ +#define F(x, y, z) (((x) & (y)) | (~(x) & (z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + F(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 0, 7, T1); + SET(d, a, b, c, 1, 12, T2); + SET(c, d, a, b, 2, 17, T3); + SET(b, c, d, a, 3, 22, T4); + SET(a, b, c, d, 4, 7, T5); + SET(d, a, b, c, 5, 12, T6); + SET(c, d, a, b, 6, 17, T7); + SET(b, c, d, a, 7, 22, T8); + SET(a, b, c, d, 8, 7, T9); + SET(d, a, b, c, 9, 12, T10); + SET(c, d, a, b, 10, 17, T11); + SET(b, c, d, a, 11, 22, T12); + SET(a, b, c, d, 12, 7, T13); + SET(d, a, b, c, 13, 12, T14); + SET(c, d, a, b, 14, 17, T15); + SET(b, c, d, a, 15, 22, T16); +#undef SET + + /* Round 2. */ + /* Let [abcd k s i] denote the operation + a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */ +#define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + G(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 1, 5, T17); + SET(d, a, b, c, 6, 9, T18); + SET(c, d, a, b, 11, 14, T19); + SET(b, c, d, a, 0, 20, T20); + SET(a, b, c, d, 5, 5, T21); + SET(d, a, b, c, 10, 9, T22); + SET(c, d, a, b, 15, 14, T23); + SET(b, c, d, a, 4, 20, T24); + SET(a, b, c, d, 9, 5, T25); + SET(d, a, b, c, 14, 9, T26); + SET(c, d, a, b, 3, 14, T27); + SET(b, c, d, a, 8, 20, T28); + SET(a, b, c, d, 13, 5, T29); + SET(d, a, b, c, 2, 9, T30); + SET(c, d, a, b, 7, 14, T31); + SET(b, c, d, a, 12, 20, T32); +#undef SET + + /* Round 3. */ + /* Let [abcd k s t] denote the operation + a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */ +#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + H(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 5, 4, T33); + SET(d, a, b, c, 8, 11, T34); + SET(c, d, a, b, 11, 16, T35); + SET(b, c, d, a, 14, 23, T36); + SET(a, b, c, d, 1, 4, T37); + SET(d, a, b, c, 4, 11, T38); + SET(c, d, a, b, 7, 16, T39); + SET(b, c, d, a, 10, 23, T40); + SET(a, b, c, d, 13, 4, T41); + SET(d, a, b, c, 0, 11, T42); + SET(c, d, a, b, 3, 16, T43); + SET(b, c, d, a, 6, 23, T44); + SET(a, b, c, d, 9, 4, T45); + SET(d, a, b, c, 12, 11, T46); + SET(c, d, a, b, 15, 16, T47); + SET(b, c, d, a, 2, 23, T48); +#undef SET + + /* Round 4. */ + /* Let [abcd k s t] denote the operation + a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */ +#define I(x, y, z) ((y) ^ ((x) | ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + I(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 0, 6, T49); + SET(d, a, b, c, 7, 10, T50); + SET(c, d, a, b, 14, 15, T51); + SET(b, c, d, a, 5, 21, T52); + SET(a, b, c, d, 12, 6, T53); + SET(d, a, b, c, 3, 10, T54); + SET(c, d, a, b, 10, 15, T55); + SET(b, c, d, a, 1, 21, T56); + SET(a, b, c, d, 8, 6, T57); + SET(d, a, b, c, 15, 10, T58); + SET(c, d, a, b, 6, 15, T59); + SET(b, c, d, a, 13, 21, T60); + SET(a, b, c, d, 4, 6, T61); + SET(d, a, b, c, 11, 10, T62); + SET(c, d, a, b, 2, 15, T63); + SET(b, c, d, a, 9, 21, T64); +#undef SET + + /* Then perform the following additions. (That is increment each + of the four registers by the value it had before this block + was started.) */ + pms->abcd[0] += a; + pms->abcd[1] += b; + pms->abcd[2] += c; + pms->abcd[3] += d; +} + +void +md5_init(md5_state_t *pms) +{ + pms->count[0] = pms->count[1] = 0; + pms->abcd[0] = 0x67452301; + pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476; + pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301; + pms->abcd[3] = 0x10325476; +} + +void +md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) +{ + const md5_byte_t *p = data; + int left = nbytes; + int offset = (pms->count[0] >> 3) & 63; + md5_word_t nbits = (md5_word_t)(nbytes << 3); + + if (nbytes <= 0) + return; + + /* Update the message length. */ + pms->count[1] += nbytes >> 29; + pms->count[0] += nbits; + if (pms->count[0] < nbits) + pms->count[1]++; + + /* Process an initial partial block. */ + if (offset) { + int copy = (offset + nbytes > 64 ? 64 - offset : nbytes); + + memcpy(pms->buf + offset, p, copy); + if (offset + copy < 64) + return; + p += copy; + left -= copy; + md5_process(pms, pms->buf); + } + + /* Process full blocks. */ + for (; left >= 64; p += 64, left -= 64) + md5_process(pms, p); + + /* Process a final partial block. */ + if (left) + memcpy(pms->buf, p, left); +} + +void +md5_finish(md5_state_t *pms, md5_byte_t digest[16]) +{ + static const md5_byte_t pad[64] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + md5_byte_t data[8]; + int i; + + /* Save the length before padding. */ + for (i = 0; i < 8; ++i) + data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3)); + /* Pad to 56 bytes mod 64. */ + md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); + /* Append the length. */ + md5_append(pms, data, 8); + for (i = 0; i < 16; ++i) + digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); +} diff --git a/phoned/remote.c b/phoned/remote.c index 2af3822..46043ca 100644 --- a/phoned/remote.c +++ b/phoned/remote.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Amigan: phoned/phoned/remote.c,v 1.7 2005/06/19 05:08:50 dcp1990 Exp $ */ +/* $Amigan: phoned/phoned/remote.c,v 1.8 2005/06/20 01:39:50 dcp1990 Exp $ */ /* system includes */ #include #include @@ -43,6 +43,9 @@ #define CHK(m) strcasecmp(m, argvect[cpos]) == 0 #define RNF(m) s->freeit = 0; free(is); return(m) +login_t *usertop = 0x0; +pthread_mutex_t usermx = PTHREAD_MUTEX_INITIALIZER; + /* taken from FreeBSD /usr/src/lib/libc/string/strsep.c */ char * mysep(stringp, delim) char **stringp; @@ -58,7 +61,13 @@ char * mysep(stringp, delim) for (tok = s;;) { c = *s++; spanp = delim; - if(c == '"' || c == '\'') inquot = inquot ? 0 : 1; + if(c == '"') { + if(inquot) { + s[-1] = 0; + c = *s++; + } + inquot = inquot ? 0 : 1; + } do { if ((sc = *spanp++) == c && !inquot) { if (c == 0) @@ -73,30 +82,171 @@ char * mysep(stringp, delim) /* NOTREACHED */ } +login_t *check_logged_in(loginna, top) + char *loginna; + login_t *top; +{ + login_t *c; + if(top == 0x0) return 0; + for(c = top; c->next != NULL; c = c->next) { + if(strcmp(loginna, c->name) == 0) { + return c; + } + } + if(strcmp(loginna, c->name) == 0) { + return c; + } + return NULL; +} + +void log_out_user(loginna, toppt) /* needs locking */ + char *loginna; + login_t **toppt; +{ + login_t *c, *top, *l; + short found = 0; + top = *toppt; + if(loginna != NULL) { + for(c = top; c != NULL; c = c->next) { + if(strcmp(loginna, c->name) == 0) { + found = 1; + break; + } + } + if(!found) return; + top = c; + } + if(top->last == 0x0) { + if(top->next != 0x0) c = top->next; else c = 0x0; + free_login(top, 0); + if(!c) *toppt = 0x0; else *toppt = c; + } else { + c = top->next; + l = top->last; + free_login(top, 0); + l->next = c; + c->last = l; + } +} + +void free_login(t, traverse) + login_t *t; + short traverse; +{ + login_t *c, *nex; + if(!traverse) { + free(t->name); + free(t); + } else { + c = t; + while(c != NULL) { + nex = c->next; + free_login(c, 0); /* recursive, babayyy */ + c = nex; + } + } +} + +void flush_logins(void) +{ + pthread_mutex_lock(&usermx); + free_login(usertop, 1); + pthread_mutex_unlock(&usermx); +} + +login_t *add_to_login_list(loginna, toppt) + char *loginna; + login_t **toppt; +{ + login_t *c, *n, *top; + time_t now; + now = time(NULL); + top = *toppt; + n = malloc(sizeof(login_t)); + memset(n, 0x0, sizeof(login_t)); + n->logintime = now; + n->name = strdup(loginna); + if(top == 0x0) { + *toppt = n; + } else { + for(c = top; c->next != NULL; c = c->next); + n->last = c; + c->next = n; + } + return n; +} + + +short log_in_user(loginna, pass, lnt) + char *loginna; + char *pass; + login_t **lnt; +{ + pthread_mutex_lock(&usermx); + if((*lnt = check_logged_in(loginna, usertop))) { + pthread_mutex_unlock(&usermx); + return -1; + } + if(db_check_crend(loginna, pass)) { + *lnt = add_to_login_list(loginna, &usertop); + pthread_mutex_unlock(&usermx); + return 1; + } else { + pthread_mutex_unlock(&usermx); + return 0; + } + /* NOTREACHED */ + pthread_mutex_unlock(&usermx); + return 0; +} + char *parse_command(cmd, cont, s) const char *cmd; short *cont; state_info_t *s; { - char **ap, *is, *argvect[MAXARGS]; + char **ap, *is, *argvect[MAXARGS], *ia; int cpos = 0; + int rc; memset(argvect, 0, sizeof(argvect)); is = strdup(cmd); + ia = is; *cont = 0x1; - for(ap = argvect; (*ap = mysep(&is, " \t")) != NULL;) + for(ap = argvect; (*ap = mysep(&ia, " \t")) != NULL;) { + if(**ap == '"') *ap = *ap + 1; if(**ap != '\0') if(++ap >= &argvect[MAXARGS]) break; + } /* begin checking */ switch(s->st) { case init: if(CHK("login")) { ++cpos; if(argvect[cpos] != NULL && argvect[cpos + 1] != NULL) { - /* TODO: put login stuff here */ + rc = log_in_user(argvect[cpos], argvect[cpos + 1], &s->l); + cpos++; + if(rc == -1) { + RNF("501 LOGGEDIN: Already logged in.\n"); + } else if(rc) { + RNF("501 LOGGEDIN: Logged in! Welcome!\n"); + } else if(!rc) { + RNF("514 LOGINFAIL: Login failed.\n"); + } } else { RNF("513 ERROR: Syntax error: Needs username and pass as arguments.\n"); } + } else if(CHK("logout")) { + if(s->l != NULL) { + pthread_mutex_lock(&usermx); + log_out_user(NULL, &s->l); + if(s->l == 0x0) usertop = 0; + pthread_mutex_unlock(&usermx); + s->l = NULL; + RNF("502 LOGGEDOUT: User logged out.\n"); + } else { + RNF("513 ERROR: Not logged in!\n"); + } } else if(CHK("thandler")) { cid_t c; c.number = "7823020300"; @@ -169,5 +319,11 @@ void begin_dialogue(fp, fd) if(si.freeit) free(rcode); } } + if(si.l != NULL) { + pthread_mutex_lock(&usermx); + log_out_user(NULL, &si.l); + if(si.l == 0x0) usertop = 0; + pthread_mutex_unlock(&usermx); + } lprintf(info, "Connection closed in begin_dialogue\n"); }