From 493eb47af380f5efc8ab822807b410a5e8fafed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=81=E5=AE=81?= <magike.net@gmail.com>
Date: Fri, 10 Oct 2014 14:17:25 +0800
Subject: [PATCH] fix #291
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

给token字符串加上扰码机制
---
 admin/editor-js.php    |  2 +-
 admin/write-post.php   |  1 +
 install.php            |  2 +-
 var/Typecho/Common.php | 49 ++++++++++++++++++++++++++++++++++++++++++
 var/Widget/Archive.php |  4 ++--
 5 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/admin/editor-js.php b/admin/editor-js.php
index c3c551bdcb..949305c12b 100644
--- a/admin/editor-js.php
+++ b/admin/editor-js.php
@@ -6,7 +6,7 @@
 <script>
 $(document).ready(function () {
     var textarea = $('#text'),
-        toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore(textarea.parent())
+        toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore(textarea.parent()),
         preview = $('<div id="wmd-preview" class="wmd-hidetab" />').insertAfter('.editor');
 
     var options = {}, isMarkdown = <?php echo intval($content->isMarkdown || !$content->have()); ?>;
diff --git a/admin/write-post.php b/admin/write-post.php
index d8ad69f8c0..b84749c77a 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -39,6 +39,7 @@
                     </p>
                     <p>
                         <label for="text" class="sr-only"><?php _e('文章内容'); ?></label>
+                        <div class="editor" id="wmd-button-bar"></div>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($post->text); ?></textarea>
                     </p>
                     
diff --git a/install.php b/install.php
index aaedaeb325..ce361a3e07 100644
--- a/install.php
+++ b/install.php
@@ -67,7 +67,7 @@
     }
 
     $parts = parse_url($_SERVER['HTTP_REFERER']);
-	if (!empty($parts['port']) && $parts['port'] != 80) {
+	if (!empty($parts['port']) && $parts['port'] != 80 && !Typecho_Common::isAppEngine()) {
         $parts['host'] = "{$parts['host']}:{$parts['port']}";
     }
 
diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index 384d9c3a14..e076fdda06 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -924,6 +924,55 @@ public static function url($path, $prefix)
         return rtrim($prefix, '/') . '/' . str_replace('//', '/', ltrim($path, '/'));
     }
 
+    /**
+     * 给javascript赋值加入扰码设计 
+     * 
+     * @param string $value 
+     * @return string
+     */
+    public static function shuffleScriptVar($value)
+    {
+        $length = strlen($value);
+        $max = 3;
+        $offset = 0;
+        $result = [];
+        $cut = [];
+
+        while ($length > 0) {
+            $len = rand(0, min($max, $length));
+            $rand = "'" . self::randString(rand(1, $max)) . "'";
+
+            if ($len > 0) {
+                $val = "'" . substr($value, $offset, $len) . "'";
+                $result[] = rand(0, 1) ? "//{$rand}\n{$val}" : "{$val}//{$rand}\n";
+            } else {
+                if (rand(0, 1)) {
+                    $result[] = rand(0, 1) ? "''///*{$rand}*/{$rand}\n" : "/* {$rand}//{$rand} */''";
+                } else {
+                    $result[] = rand(0, 1) ? "//{$rand}\n{$rand}" : "{$rand}//{$rand}\n";
+                    $cut[] = [$offset, strlen($rand) - 2 + $offset];
+                }
+            }
+
+            $offset += $len;
+            $length -= $len;
+        }
+
+        $name = '_' . self::randString(rand(3, 7));
+        $cutName = '_' . self::randString(rand(3, 7));
+        $var = implode('+', $result);
+        $cutVar = Json::encode($cut);
+        return "(function () {
+    var {$name} = {$var}, {$cutName} = {$cutVar};
+    
+    for (var i = 0; i < {$cutName}.length; i ++) {
+        {$name} = {$name}.substring(0, {$cutName}[i][0]) + {$name}.substring({$cutName}[i][1]);
+    }
+
+    return {$name};
+})();";
+    }
+
     /**
      * 过滤字段名
      *
diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php
index 579ddfa5dd..8fe5d1dae3 100644
--- a/var/Widget/Archive.php
+++ b/var/Widget/Archive.php
@@ -1786,7 +1786,6 @@ public function header($rule = NULL)
     };
 
     document[event.add](event.load, function () {
-        console.log('ddd');
         var r = document.getElementById('{$this->respondId}');
 
         if (null != r) {
@@ -1800,7 +1799,8 @@ public function header($rule = NULL)
                             var input = document.createElement('input');
                             input.type = 'hidden';
                             input.name = '_';
-                            input.value = '" . $this->security->getToken($this->request->getRequestUrl()) . "';
+                            input.value = " . Typecho_Common::shuffleScriptVar(
+                                $this->security->getToken($this->request->getRequestUrl())) . "
 
                             f.appendChild(input);
                             added = true;