@- Added extension for the cracklib library. (Alexander Feldman)

diff --git a/ext/crack/Makefile.in b/ext/crack/Makefile.in
new file mode 100644 (file)
index 0000000..db85e88
--- /dev/null
+++ b/ext/crack/Makefile.in
@@ -0,0 +1,8 @@
+# $Id$
+
+LTLIBRARY_NAME        = libcrack.la
+LTLIBRARY_SOURCES     = crack.c
+LTLIBRARY_SHARED_NAME = crack.la
+LTLIBRARY_SHARED_LIBADD  = $(CRACK_SHARED_LIBADD)
+
+include $(top_srcdir)/build/dynlib.mk

diff --git a/ext/crack/config.m4 b/ext/crack/config.m4
new file mode 100644 (file)
index 0000000..08c0235
--- /dev/null
+++ b/ext/crack/config.m4
@@ -0,0 +1,31 @@
+dnl $Id$
+
+PHP_ARG_WITH(crack, whether to include crack support,
+[  --with-crack[=DIR]      Include crack support.])
+
+if test "$PHP_CRACK" != "no"; then
+       for i in /usr/local/lib /usr/lib $PHP_CRACK $PHP_CRACK/cracklib; do
+               if test -f $i/libcrack.a; then
+                       CRACK_LIBDIR=$i
+               fi
+       done
+       for i in /usr/local/include /usr/include $PHP_CRACK $PHP_CRACK/cracklib; do
+               if test -f $i/packer.h; then
+                       CRACK_INCLUDEDIR=$i
+               fi
+       done
+  
+       if test -z "$CRACK_LIBDIR"; then
+               AC_MSG_ERROR(Cannot find the cracklib library file)
+       fi
+       if test -z "$CRACK_INCLUDEDIR"; then
+               AC_MSG_ERROR(Cannot find a cracklib header file)
+       fi
+
+    AC_ADD_INCLUDE($CRACK_INCLUDEDIR)
+       AC_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR)
+
+       PHP_EXTENSION(crack, $ext_shared)
+
+       AC_DEFINE(HAVE_CRACK, 1, [ ])
+fi

diff --git a/ext/crack/crack.c b/ext/crack/crack.c
new file mode 100644 (file)
index 0000000..7bbd3bf
--- /dev/null
+++ b/ext/crack/crack.c
@@ -0,0 +1,255 @@
+#include "php.h"
+#include "php_ini.h"
+#include "php_crack.h"
+
+#if HAVE_CRACK
+
+#include <packer.h>
+
+ZEND_DECLARE_MODULE_GLOBALS(crack)
+
+/* True global resources - no need for thread safety here */
+static int le_crack;
+
+function_entry crack_functions[] = {
+       ZEND_FE(crack_opendict, NULL)
+       ZEND_FE(crack_closedict, NULL)
+       ZEND_FE(crack_check,    NULL)
+       ZEND_FE(crack_getlastmessage, NULL)
+       {NULL, NULL, NULL}
+};
+
+zend_module_entry crack_module_entry = {
+       "crack",
+       crack_functions,
+       ZEND_MINIT(crack),
+       ZEND_MSHUTDOWN(crack),
+       ZEND_RINIT(crack),
+       ZEND_RSHUTDOWN(crack),
+       PHP_MINFO(crack),
+       STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_CRACK
+ZEND_GET_MODULE(crack)
+#endif
+
+PHP_INI_BEGIN()
+       STD_PHP_INI_ENTRY("crack.default_dictionary", NULL, PHP_INI_SYSTEM, OnUpdateString, default_dictionary, zend_crack_globals, crack_globals)
+PHP_INI_END()
+
+long _crack_open_dict(char *dictpath)
+{
+       PWDICT *pwdict;
+       long resource;
+
+       CRACKLS_FETCH();
+
+       if (CRACKG(current_id) != -1) {
+               zend_error(E_WARNING, "Can not use more than one open dictionary with this implementation of libcrack");
+               return -1;
+       }
+       if (NULL == (pwdict = PWOpen(dictpath, "r"))) {
+               zend_error(E_WARNING, "Unable to open a crack dictionary");
+               return -1;
+       }
+
+       resource = zend_list_insert(pwdict, le_crack);
+
+/*     if (CRACKG(current_id) != -1) {
+               zend_list_delete(CRACKG(current_id));
+       }
+*/
+       CRACKG(current_id) = resource;
+       
+       return resource;
+}
+
+void _close_crack_dict(PWDICT *pwdict)
+{
+       PWClose(pwdict);
+}
+
+ZEND_MINIT_FUNCTION(crack)
+{
+       REGISTER_INI_ENTRIES();
+
+       le_crack = register_list_destructors(_close_crack_dict, NULL);
+
+       return SUCCESS;
+}
+
+ZEND_MSHUTDOWN_FUNCTION(crack)
+{
+       UNREGISTER_INI_ENTRIES();
+
+       return SUCCESS;
+}
+
+ZEND_RINIT_FUNCTION(crack)
+{
+       CRACKLS_FETCH();
+
+       CRACKG(last_message) = NULL;
+       CRACKG(current_id) = -1;
+
+       return SUCCESS;
+}
+
+ZEND_RSHUTDOWN_FUNCTION(crack)
+{
+       CRACKLS_FETCH();
+
+       if (NULL != CRACKG(last_message)) {
+               efree(CRACKG(last_message));
+       }
+}
+
+PHP_MINFO_FUNCTION(crack)
+{
+       php_info_print_table_start();
+       php_info_print_table_header(2, "crack support", "enabled");
+       php_info_print_table_end();
+
+       DISPLAY_INI_ENTRIES();
+}
+
+/* {{{ proto string crack_opendict(string dictionary)
+   Opens a new cracklib dictionary */
+ZEND_FUNCTION(crack_opendict)
+{
+       zval **dictpath;
+       long resource;
+
+       if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &dictpath) == FAILURE) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(dictpath);
+
+       if (-1 == (resource = _crack_open_dict(Z_STRVAL_PP(dictpath)))) {
+               RETURN_FALSE;
+       }
+       
+       RETURN_RESOURCE(resource);
+}
+/* }}} */
+
+/* {{{ proto string crack_closedict([int link_identifier])
+   Closes an open cracklib dictionary. */
+ZEND_FUNCTION(crack_closedict)
+{
+       PWDICT *pwdict;
+       zval **dictionary;
+       long id;
+
+       CRACKLS_FETCH();
+
+       switch (ZEND_NUM_ARGS()) {
+               case 0:
+                       id = CRACKG(current_id);
+                       break;
+               case 1:
+                       if (zend_get_parameters_ex(1, &dictionary) == FAILURE) {
+                               WRONG_PARAM_COUNT;
+                       }
+                       id = (*dictionary)->value.lval;
+                       break;
+               default:
+                       WRONG_PARAM_COUNT;
+                       break;
+       }
+
+       ZEND_FETCH_RESOURCE(pwdict, PWDICT *, dictionary, id, "cracklib dictionary", le_crack);
+       if (CRACKG(current_id) == id) {
+               CRACKG(current_id) = -1;
+       }
+       zend_list_delete(id);
+
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string crack_check([int dictionary,] string password)
+   Performs an obscure check with the given password */
+ZEND_FUNCTION(crack_check)
+{
+       zval **dictionary = NULL, **password;
+       char pwtrunced[STRINGSIZE];
+       char *message;
+       PWDICT *pwdict;
+       long id;
+
+       CRACKLS_FETCH();
+
+       switch (ZEND_NUM_ARGS()) {
+               case 1:
+                       if (zend_get_parameters_ex(1, &password) == FAILURE) {
+                               RETURN_FALSE;
+                       }
+                       if (NULL != CRACKG(default_dictionary) && CRACKG(current_id) == -1) {
+                               _crack_open_dict(CRACKG(default_dictionary));
+                       }
+                       id = CRACKG(current_id);
+                       break;
+               case 2:
+                       if (zend_get_parameters_ex(2, &dictionary, &password) == FAILURE) {
+                               RETURN_FALSE;
+                       }
+                       id = -1;
+                       break;
+               default:
+                       WRONG_PARAM_COUNT;
+               break;
+       }
+
+       ZEND_FETCH_RESOURCE(pwdict, PWDICT *, dictionary, id, "cracklib dictionary", le_crack);
+       convert_to_string_ex(password);
+
+       /* Prevent buffer overflow attacks. */
+       strlcpy(pwtrunced, Z_STRVAL_PP(password), sizeof(pwtrunced));
+
+       message = (char *)FascistLook(pwdict, pwtrunced);
+
+       if (NULL != CRACKG(last_message)) {
+               efree(CRACKG(last_message));
+       }
+
+       if (NULL == message) {
+               CRACKG(last_message) = estrdup("strong password");
+               RETURN_TRUE;
+       }
+       
+       CRACKG(last_message) = estrdup(message);
+       RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto string crack_getlastmessage()
+   Returns the message from the last obscure check. */
+ZEND_FUNCTION(crack_getlastmessage)
+{
+       CRACKLS_FETCH();
+
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+       
+       if (NULL == CRACKG(last_message)) {
+               zend_error(E_WARNING, "No obscure checks in this session");
+               RETURN_FALSE;
+       }
+
+       RETURN_STRING(CRACKG(last_message), 1);
+}
+/* }}} */
+
+#endif /* HAVE_CRACK */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

diff --git a/ext/crack/php_crack.h b/ext/crack/php_crack.h
new file mode 100644 (file)
index 0000000..17ad313
--- /dev/null
+++ b/ext/crack/php_crack.h
@@ -0,0 +1,54 @@
+#ifndef ZEND_CRACK_H
+#define ZEND_CRACK_H
+
+#if HAVE_CRACK
+
+extern zend_module_entry crack_module_entry;
+#define phpext_crack_ptr &crack_module_entry
+
+#ifdef ZEND_WIN32
+#define ZEND_CRACK_API __declspec(dllexport)
+#else
+#define ZEND_CRACK_API
+#endif
+
+ZEND_MINIT_FUNCTION(crack);
+ZEND_MSHUTDOWN_FUNCTION(crack);
+ZEND_RINIT_FUNCTION(crack);
+ZEND_RSHUTDOWN_FUNCTION(crack);
+PHP_MINFO_FUNCTION(crack);
+
+ZEND_FUNCTION(crack_opendict);
+ZEND_FUNCTION(crack_closedict);
+ZEND_FUNCTION(crack_check);
+ZEND_FUNCTION(crack_getlastmessage);
+
+ZEND_BEGIN_MODULE_GLOBALS(crack)
+       char *default_dictionary;
+       char *last_message;
+       long current_id;
+ZEND_END_MODULE_GLOBALS(crack)
+
+#ifdef ZTS
+#define CRACKG(v) (crack_globals->v)
+#define CRACKLS_FETCH() zend_crack_globals *crack_globals = ts_resource(crack_globals_id)
+#else
+#define CRACKG(v) (crack_globals.v)
+#define CRACKLS_FETCH()
+#endif
+
+#else
+
+#define phpext_crack_ptr NULL
+
+#endif
+
+#endif /* ZEND_CRACK_H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

diff --git a/ext/crack/tests/001.phpt b/ext/crack/tests/001.phpt
new file mode 100644 (file)
index 0000000..dc18ef5
--- /dev/null
+++ b/ext/crack/tests/001.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Check for crack presence
+--SKIPIF--
+<?php if (!extension_loaded("crack")) print "skip"; ?>
+--POST--
+--GET--
+--FILE--
+<?php 
+echo "crack extension is available";
+/*
+       you can add regression tests for your extension here
+
+  the output of your test code has to be equal to the
+  text in the --EXPECT-- section below for the tests
+  to pass, differences between the output and the
+  expected text are interpreted as failure
+
+       see php4/tests/README for further information on
+  writing regression tests
+*/
+?>
+--EXPECT--
+crack extension is available
\ No newline at end of file