Merge branch 'master' into develop

polaris1119 · polaris1119 · commit fe2e49122064 · 2014-10-28T21:55:08.000+08:00
diff --git a/websites/code/studygolang/src/controller/index.go b/websites/code/studygolang/src/controller/index.go
@@ -9,10 +9,15 @@ package controller
 import (
 	"math/rand"
 	"net/http"
+	"net/url"
+	"strings"
 
+	"config"
 	"filter"
+	"logger"
 	"model"
 	"service"
+	"util"
 )
 
 // 首页
@@ -52,3 +57,56 @@ func IndexHandler(rw http.ResponseWriter, req *http.Request) {
 	// 设置模板数据
 	filter.SetData(req, map[string]interface{}{"topics": newTopics, "articles": recentArticles, "likeflags": likeFlags, "resources": resources[start:end]})
 }
+
+// 包装链接
+func WRHandler(rw http.ResponseWriter, req *http.Request) {
+	tUrl := req.FormValue("u")
+	if tUrl == "" {
+		util.Redirect(rw, req, "/")
+		return
+	}
+
+	if pUrl, err := url.Parse(tUrl); err != nil {
+		util.Redirect(rw, req, tUrl)
+		return
+	} else {
+		if !pUrl.IsAbs() {
+			util.Redirect(rw, req, tUrl)
+			return
+		}
+
+		// 本站
+		if strings.Contains(pUrl.Host, config.Config["domain"]) {
+			util.Redirect(rw, req, tUrl)
+			return
+		}
+
+		// 检测是否禁止了 iframe 加载
+		// 看是否在黑名单中
+		for _, denyHost := range strings.Split(config.Config["iframe_deny"], ",") {
+			if strings.Contains(pUrl.Host, denyHost) {
+				util.Redirect(rw, req, tUrl)
+				return
+			}
+		}
+
+		// 检测会比较慢，进行异步检测，记录下来，以后分析再加黑名单
+		go func() {
+			resp, err := http.Head(tUrl)
+			if err != nil {
+				logger.Errorln("[iframe] head url:", tUrl, "error:", err)
+				return
+			}
+			defer resp.Body.Close()
+			if resp.Header.Get("X-Frame-Options") != "" {
+				logger.Errorln("[iframe] deny:", tUrl)
+				return
+			}
+		}()
+	}
+
+	// 设置内容模板
+	req.Form.Set(filter.CONTENT_TPL_KEY, "/template/wr.html")
+	// 设置模板数据
+	filter.SetData(req, map[string]interface{}{"url": tUrl})
+}
diff --git a/websites/code/studygolang/src/filter/view.go b/websites/code/studygolang/src/filter/view.go
@@ -170,6 +170,7 @@ func (this *ViewFilter) PostFilter(rw http.ResponseWriter, req *http.Request) bo
 			strings.Contains(req.RequestURI, "project") ||
 			strings.HasPrefix(req.RequestURI, "/p/") ||
 			strings.Contains(req.RequestURI, "reading") ||
+			strings.HasPrefix(req.RequestURI, "/wr") ||
 			req.RequestURI == "/" ||
 			strings.Contains(req.RequestURI, "search") {
 			this.commonHtmlFiles = []string{config.ROOT + "/template/common/layout.html"}
diff --git a/websites/code/studygolang/src/server/studygolang/router.go b/websites/code/studygolang/src/server/studygolang/router.go
@@ -32,6 +32,8 @@ func initRouter() *mux.Router {
 	router.FilterChain(fontFilterChan)
 
 	router.HandleFunc("/", IndexHandler)
+	router.HandleFunc("/wr", WRHandler)
+
 	router.HandleFunc("/topics{view:(|/popular|/no_reply|/last)}", TopicsHandler)
 	router.HandleFunc("/topics/{tid:[0-9]+}", TopicDetailHandler)
 	router.HandleFunc("/topics/new{json:(|.json)}", NewTopicHandler).AppendFilterChain(loginFilterChain)
diff --git a/websites/code/studygolang/template/articles/detail.html b/websites/code/studygolang/template/articles/detail.html
@@ -53,8 +53,8 @@ <h1>{{.article.Title}}</h1>
 			</div>
 			<!-- content END -->
 			<div class="row orig-info">
-				<p>本文来自：<a href="http://{{.article.Domain}}" target="_blank" title="{{.article.Name}}">{{.article.Name}}</a></p>
-				<p>查看原文：<a href="{{.article.Url}}" target="_blank" title="{{.article.Title}}">{{.article.Title}}</a></p>
+				<p>本文来自：<a href="/wr?u=http://{{.article.Domain}}" target="_blank" title="{{.article.Name}}">{{.article.Name}}</a></p>
+				<p>查看原文：<a href="/wr?u={{.article.Url}}" target="_blank" title="{{.article.Title}}">{{.article.Title}}</a></p>
 			</div>
 			<div class="active row">
 				<div class="mark-like-btn col-md-8">
@@ -161,6 +161,13 @@ <h3><span class="cmtnum">{{.article.Cmtnum}}</span>条评论</h3>
 	$('.need-autogrow').autoGrow();
 	
 	loadComments();
+
+	// 文章链接，在本站的 iframe 中打开
+	$('#wrapper .content').on('mousedown', 'a', function(evt){
+			var url = $(this).attr('href');
+			$(this).attr('href', '/wr?u='+url);
+			$(this).attr('target', '_blank');
+	});
 });
 </script>
 {{end}}
diff --git a/websites/code/studygolang/template/common/layout.html b/websites/code/studygolang/template/common/layout.html
@@ -90,7 +90,7 @@
 			</div>
 		</div>
 	</header>
-	<div class="wrapper">
+	<div class="wrapper" id="wrapper">
 		<div class="container" role="main">
 			{{template "content" .}}
 		</div>
diff --git a/websites/code/studygolang/template/readings/list.html b/websites/code/studygolang/template/readings/list.html
@@ -1,6 +1,6 @@
-{{define "title"}}网友博文{{end}}
-{{define "seo"}}<meta name="keywords" content="Go语言博客文章, Go语言博文, Go语言, Golang, Go中文社区,Golang中文社区, Go语言社区, Go语言学习园地">
-<meta name="description" content="文章来自国内知名网站，Go爱好者学习笔记，经验分享；也有爱好者自己的博客文章，已经一些国外精彩文章。">{{end}}
+{{define "title"}}技术晨读 {{end}}
+{{define "seo"}}<meta name="keywords" content="技术晨读, Go语言技术晨读, Go语言, Golang, Go中文社区,Golang中文社区, Go语言社区, Go语言中文网, Go语言学习园地">
+<meta name="description" content="Go语言中文网每天给gopher们分享技术，每天一篇技术晨读，和大家一起进步">{{end}}
 {{define "content"}}
 <div class="row banner">
 </div>
