diff --git a/admin/options-theme.php b/admin/options-theme.php index 1ced74d7..d5fdb46e 100644 --- a/admin/options-theme.php +++ b/admin/options-theme.php @@ -11,7 +11,9 @@ include 'menu.php';
diff --git a/install.php b/install.php index 2e016a98..f4c3148d 100644 --- a/install.php +++ b/install.php @@ -358,8 +358,9 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion); /** 初始用户 */ $password = empty($config['userPassword']) ? substr(uniqid(), 7) : $config['userPassword']; + $hasher = new PasswordHash(8, true); - $installDb->query($installDb->insert('table.users')->rows(array('name' => $config['userName'], 'password' => Typecho_Common::hash($password), 'mail' => $config['userMail'], + $installDb->query($installDb->insert('table.users')->rows(array('name' => $config['userName'], 'password' => $hasher->HashPassword($password), 'mail' => $config['userMail'], 'url' => 'http://www.typecho.org', 'screenName' => $config['userName'], 'group' => 'administrator', 'created' => Typecho_Date::gmtTime()))); unset($_SESSION['typecho']); diff --git a/var/PasswordHash.php b/var/PasswordHash.php new file mode 100644 index 00000000..bf6e214e --- /dev/null +++ b/var/PasswordHash.php @@ -0,0 +1,257 @@ + in 2004-2006 and placed in +# the public domain. +# +# There's absolutely no warranty. +# +# Please be sure to update the Version line if you edit this file in any way. +# It is suggested that you leave the main version number intact, but indicate +# your project name (after the slash) and add your own revision information. +# +# Please do not change the "private" password hashing method implemented in +# here, thereby making your hashes incompatible. However, if you must, please +# change the hash type identifier (the "$P$") to something different. +# +# Obviously, since this code is in the public domain, the above are not +# requirements (there can be none), but merely suggestions. +# + +/** + * Portable PHP password hashing framework. + * + * @package phpass + * @version 0.2 / genuine. + * @link http://www.openwall.com/phpass/ + * @since 2.5 + */ +class PasswordHash { + var $itoa64; + var $iteration_count_log2; + var $portable_hashes; + var $random_state; + + function PasswordHash($iteration_count_log2, $portable_hashes) + { + $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + + if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) + $iteration_count_log2 = 8; + $this->iteration_count_log2 = $iteration_count_log2; + + $this->portable_hashes = $portable_hashes; + + $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compability reasons + } + + function get_random_bytes($count) + { + $output = ''; + if ( @is_readable('/dev/urandom') && + ($fh = @fopen('/dev/urandom', 'rb'))) { + $output = fread($fh, $count); + fclose($fh); + } + + if (strlen($output) < $count) { + $output = ''; + for ($i = 0; $i < $count; $i += 16) { + $this->random_state = + md5(microtime() . $this->random_state); + $output .= + pack('H*', md5($this->random_state)); + } + $output = substr($output, 0, $count); + } + + return $output; + } + + function encode64($input, $count) + { + $output = ''; + $i = 0; + do { + $value = ord($input[$i++]); + $output .= $this->itoa64[$value & 0x3f]; + if ($i < $count) + $value |= ord($input[$i]) << 8; + $output .= $this->itoa64[($value >> 6) & 0x3f]; + if ($i++ >= $count) + break; + if ($i < $count) + $value |= ord($input[$i]) << 16; + $output .= $this->itoa64[($value >> 12) & 0x3f]; + if ($i++ >= $count) + break; + $output .= $this->itoa64[($value >> 18) & 0x3f]; + } while ($i < $count); + + return $output; + } + + function gensalt_private($input) + { + $output = '$P$'; + $output .= $this->itoa64[min($this->iteration_count_log2 + + ((PHP_VERSION >= '5') ? 5 : 3), 30)]; + $output .= $this->encode64($input, 6); + + return $output; + } + + function crypt_private($password, $setting) + { + $output = '*0'; + if (substr($setting, 0, 2) == $output) + $output = '*1'; + + if (substr($setting, 0, 3) != '$P$') + return $output; + + $count_log2 = strpos($this->itoa64, $setting[3]); + if ($count_log2 < 7 || $count_log2 > 30) + return $output; + + $count = 1 << $count_log2; + + $salt = substr($setting, 4, 8); + if (strlen($salt) != 8) + return $output; + +# We're kind of forced to use MD5 here since it's the only +# cryptographic primitive available in all versions of PHP +# currently in use. To implement our own low-level crypto +# in PHP would result in much worse performance and +# consequently in lower iteration counts and hashes that are +# quicker to crack (by non-PHP code). + if (PHP_VERSION >= '5') { + $hash = md5($salt . $password, TRUE); + do { + $hash = md5($hash . $password, TRUE); + } while (--$count); + } else { + $hash = pack('H*', md5($salt . $password)); + do { + $hash = pack('H*', md5($hash . $password)); + } while (--$count); + } + + $output = substr($setting, 0, 12); + $output .= $this->encode64($hash, 16); + + return $output; + } + + function gensalt_extended($input) + { + $count_log2 = min($this->iteration_count_log2 + 8, 24); +# This should be odd to not reveal weak DES keys, and the +# maximum valid value is (2**24 - 1) which is odd anyway. + $count = (1 << $count_log2) - 1; + + $output = '_'; + $output .= $this->itoa64[$count & 0x3f]; + $output .= $this->itoa64[($count >> 6) & 0x3f]; + $output .= $this->itoa64[($count >> 12) & 0x3f]; + $output .= $this->itoa64[($count >> 18) & 0x3f]; + + $output .= $this->encode64($input, 3); + + return $output; + } + + function gensalt_blowfish($input) + { +# This one needs to use a different order of characters and a +# different encoding scheme from the one in encode64() above. +# We care because the last character in our encoded string will +# only represent 2 bits. While two known implementations of +# bcrypt will happily accept and correct a salt string which +# has the 4 unused bits set to non-zero, we do not want to take +# chances and we also do not want to waste an additional byte +# of entropy. + $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + + $output = '$2a$'; + $output .= chr(ord('0') + $this->iteration_count_log2 / 10); + $output .= chr(ord('0') + $this->iteration_count_log2 % 10); + $output .= '$'; + + $i = 0; + do { + $c1 = ord($input[$i++]); + $output .= $itoa64[$c1 >> 2]; + $c1 = ($c1 & 0x03) << 4; + if ($i >= 16) { + $output .= $itoa64[$c1]; + break; + } + + $c2 = ord($input[$i++]); + $c1 |= $c2 >> 4; + $output .= $itoa64[$c1]; + $c1 = ($c2 & 0x0f) << 2; + + $c2 = ord($input[$i++]); + $c1 |= $c2 >> 6; + $output .= $itoa64[$c1]; + $output .= $itoa64[$c2 & 0x3f]; + } while (1); + + return $output; + } + + function HashPassword($password) + { + $random = ''; + + if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) { + $random = $this->get_random_bytes(16); + $hash = + crypt($password, $this->gensalt_blowfish($random)); + if (strlen($hash) == 60) + return $hash; + } + + if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) { + if (strlen($random) < 3) + $random = $this->get_random_bytes(3); + $hash = + crypt($password, $this->gensalt_extended($random)); + if (strlen($hash) == 20) + return $hash; + } + + if (strlen($random) < 6) + $random = $this->get_random_bytes(6); + $hash = + $this->crypt_private($password, + $this->gensalt_private($random)); + if (strlen($hash) == 34) + return $hash; + +# Returning '*' on error is safe here, but would _not_ be safe +# in a crypt(3)-like function used _both_ for generating new +# hashes and for validating passwords against existing hashes. + return '*'; + } + + function CheckPassword($password, $stored_hash) + { + $hash = $this->crypt_private($password, $stored_hash); + if ($hash[0] == '*') + $hash = crypt($password, $stored_hash); + + return $hash == $stored_hash; + } +} + diff --git a/var/Typecho/Widget.php b/var/Typecho/Widget.php index c07b01c7..9f45cdbf 100644 --- a/var/Typecho/Widget.php +++ b/var/Typecho/Widget.php @@ -190,7 +190,10 @@ abstract class Typecho_Widget */ public static function widget($alias, $params = NULL, $request = NULL, $enableResponse = true) { - list($className) = explode('@', $alias); + $parts = explode('@', $alias); + $className = $parts[0]; + $alias = empty($parts[1]) ? $className : $parts[1]; + if (isset(self::$_widgetAlias[$className])) { $className = self::$_widgetAlias[$className]; } diff --git a/var/Widget/Abstract/Contents.php b/var/Widget/Abstract/Contents.php index 8b3255c3..e937c8db 100644 --- a/var/Widget/Abstract/Contents.php +++ b/var/Widget/Abstract/Contents.php @@ -607,7 +607,7 @@ class Widget_Abstract_Contents extends Widget_Abstract */ public function getTemplates() { - $files = glob(__TYPECHO_ROOT_DIR__ . '/' . __TYPECHO_THEME_DIR__ . '/' . $this->options->theme . '/*.php'); + $files = glob($this->options->themeFile($this->options->theme, '*.php')); $result = array(); foreach ($files as $file) { diff --git a/var/Widget/Menu.php b/var/Widget/Menu.php index bd053199..3f8f6299 100644 --- a/var/Widget/Menu.php +++ b/var/Widget/Menu.php @@ -115,7 +115,7 @@ class Widget_Menu extends Typecho_Widget array(array('Widget_Plugins_Config', 'getMenuTitle'), array('Widget_Plugins_Config', 'getMenuTitle'), 'options-plugin.php?config=', 'administrator', true), array(_t('外观'), _t('网站外观'), 'themes.php', 'administrator'), array(array('Widget_Themes_Files', 'getMenuTitle'), array('Widget_Themes_Files', 'getMenuTitle'), 'theme-editor.php', 'administrator', true), - array(array('Widget_Themes_Config', 'getMenuTitle'), array('Widget_Themes_Config', 'getMenuTitle'), 'options-theme.php', 'administrator', true), + array(_t('设置外观'), _t('设置外观'), 'options-theme.php', 'administrator', true), array(_t('升级'), _t('升级程序'), 'upgrade.php', 'administrator', true), array(_t('欢迎'), _t('欢迎使用'), 'welcome.php', 'subscriber', true) ), diff --git a/var/Widget/Options.php b/var/Widget/Options.php index 284ce293..18bd86fb 100644 --- a/var/Widget/Options.php +++ b/var/Widget/Options.php @@ -433,11 +433,19 @@ class Widget_Options extends Typecho_Widget * * @access public * @param string $path 子路径 + * @param string $theme 模版名称 * @return void */ - public function themeUrl($path = NULL) + public function themeUrl($path = NULL, $theme = NULL) { - echo Typecho_Common::url($path, $this->themeUrl); + if (empty($theme)) { + echo Typecho_Common::url($path, $this->themeUrl); + } + + $url = defined('__TYPECHO_THEME_URL__') ? __TYPECHO_THEME_URL__ : + Typecho_Common::url(__TYPECHO_THEME_DIR__ . '/' . $theme, $this->siteUrl); + + return Typecho_Common::url($path, $url); } /** diff --git a/var/Widget/Options/Reading.php b/var/Widget/Options/Reading.php index 84262a82..6de80e4a 100644 --- a/var/Widget/Options/Reading.php +++ b/var/Widget/Options/Reading.php @@ -80,7 +80,7 @@ class Widget_Options_Reading extends Widget_Options_Permalink } // 自定义文件列表 - $files = glob(__TYPECHO_ROOT_DIR__ . '/' . __TYPECHO_THEME_DIR__ . '/' . $this->options->theme . '/*.php'); + $files = glob($this->options->themeFile($this->options->theme, '*.php')); $filesSelect = ''; foreach ($files as $file) { diff --git a/var/Widget/Register.php b/var/Widget/Register.php index abd3af2d..057afa2b 100644 --- a/var/Widget/Register.php +++ b/var/Widget/Register.php @@ -56,13 +56,14 @@ class Widget_Register extends Widget_Abstract_Users implements Widget_Interface_ $this->response->goBack(); } + $hasher = new PasswordHash(8, true); $generatedPassword = Typecho_Common::randString(7); $dataStruct = array( 'name' => $this->request->name, 'mail' => $this->request->mail, 'screenName'=> $this->request->name, - 'password' => Typecho_Common::hash($generatedPassword), + 'password' => $hasher->HashPassword($generatedPassword), 'created' => $this->options->gmtTime, 'group' => 'subscriber' ); diff --git a/var/Widget/Themes/Config.php b/var/Widget/Themes/Config.php index f68835cb..00f9761c 100644 --- a/var/Widget/Themes/Config.php +++ b/var/Widget/Themes/Config.php @@ -34,18 +34,7 @@ class Widget_Themes_Config extends Widget_Abstract_Options throw new Typecho_Widget_Exception(_t('外观配置功能不存在'), 404); } } - - /** - * 获取菜单标题 - * - * @access public - * @return string - */ - public function getMenuTitle() - { - return _t('设置外观 %s', $this->options->theme); - } - + /** * 配置功能是否存在 * diff --git a/var/Widget/Themes/List.php b/var/Widget/Themes/List.php index 2cb49b40..e826b03c 100644 --- a/var/Widget/Themes/List.php +++ b/var/Widget/Themes/List.php @@ -70,8 +70,7 @@ class Widget_Themes_List extends Typecho_Widget $screen = glob($theme . '/screen*.{jpg,png,gif,bmp,jpeg,JPG,PNG,GIF,BMG,JPEG}', GLOB_BRACE); if ($screen) { - $info['screen'] = Typecho_Common::url(trim(__TYPECHO_THEME_DIR__, '/') . - '/' . $info['name'] . '/' . basename(current($screen)), $siteUrl); + $info['screen'] = $options->themeUrl(basename(current($screen)), $info['name']); } else { $info['screen'] = Typecho_Common::url('noscreen.png', $options->adminStaticUrl('img')); } diff --git a/var/Widget/User.php b/var/Widget/User.php index 89fb42aa..941c5eeb 100644 --- a/var/Widget/User.php +++ b/var/Widget/User.php @@ -130,7 +130,12 @@ class Widget_User extends Typecho_Widget $hashValidate = $this->pluginHandle()->trigger($hashPluggable)->hashValidate($password, $user['password']); if (!$hashPluggable) { - $hashValidate = Typecho_Common::hashValidate($password, $user['password']); + if ('$P$' == substr($user['password'], 0, 3)) { + $hasher = new PasswordHash(8, true); + $hashValidate = $hasher->CheckPassword($password, $user['password']); + } else { + $hashValidate = Typecho_Common::hashValidate($password, $user['password']); + } } if ($user && $hashValidate) {