fixed #labstack#743

Signed-off-by: Vishal Rana <[email protected]>
affix · Nov 21, 2016 · fe269b3 · fe269b3
1 parent d4dff98
commit fe269b3
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 65 deletions.
diff --git a/middleware/cors.go b/middleware/cors.go
@@ -15,8 +15,7 @@ type (
 		Skipper Skipper
 
 		// AllowOrigin defines a list of origins that may access the resource.
-		// Optional. If request header `Origin` is set, value is []string{"<Origin>"}
-		// else []string{"*"}.
+		// Optional. Default value []string{"*"}.
 		AllowOrigins []string `json:"allow_origins"`
 
 		// AllowMethods defines a list methods allowed when accessing the resource.
@@ -52,6 +51,7 @@ var (
 	// DefaultCORSConfig is the default CORS middleware config.
 	DefaultCORSConfig = CORSConfig{
 		Skipper:      defaultSkipper,
+		AllowOrigins: []string{"*"},
 		AllowMethods: []string{echo.GET, echo.HEAD, echo.PUT, echo.PATCH, echo.POST, echo.DELETE},
 	}
 )
@@ -69,11 +69,13 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 	if config.Skipper == nil {
 		config.Skipper = DefaultCORSConfig.Skipper
 	}
+	if len(config.AllowOrigins) == 0 {
+		config.AllowOrigins = DefaultCORSConfig.AllowOrigins
+	}
 	if len(config.AllowMethods) == 0 {
 		config.AllowMethods = DefaultCORSConfig.AllowMethods
 	}
 
-	allowedOrigins := strings.Join(config.AllowOrigins, ",")
 	allowMethods := strings.Join(config.AllowMethods, ",")
 	allowHeaders := strings.Join(config.AllowHeaders, ",")
 	exposeHeaders := strings.Join(config.ExposeHeaders, ",")
@@ -88,21 +90,20 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 			req := c.Request()
 			res := c.Response()
 			origin := req.Header.Get(echo.HeaderOrigin)
+			allowOrigin := ""
 
-			if allowedOrigins == "" {
-				if origin != "" {
-					allowedOrigins = origin
-				} else {
-					if !config.AllowCredentials {
-						allowedOrigins = "*"
-					}
+			// Check allowed origins
+			for _, o := range config.AllowOrigins {
+				if o == "*" || o == origin {
+					allowOrigin = o
+					break
 				}
 			}
 
 			// Simple request
 			if req.Method != echo.OPTIONS {
 				res.Header().Add(echo.HeaderVary, echo.HeaderOrigin)
-				res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowedOrigins)
+				res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowOrigin)
 				if config.AllowCredentials {
 					res.Header().Set(echo.HeaderAccessControlAllowCredentials, "true")
 				}
@@ -116,7 +117,7 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 			res.Header().Add(echo.HeaderVary, echo.HeaderOrigin)
 			res.Header().Add(echo.HeaderVary, echo.HeaderAccessControlRequestMethod)
 			res.Header().Add(echo.HeaderVary, echo.HeaderAccessControlRequestHeaders)
-			res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowedOrigins)
+			res.Header().Set(echo.HeaderAccessControlAllowOrigin, allowOrigin)
 			res.Header().Set(echo.HeaderAccessControlAllowMethods, allowMethods)
 			if config.AllowCredentials {
 				res.Header().Set(echo.HeaderAccessControlAllowCredentials, "true")

diff --git a/middleware/cors_test.go b/middleware/cors_test.go
@@ -12,29 +12,22 @@ import (
 func TestCORS(t *testing.T) {
 	e := echo.New()
 
-	// Origin origin
+	// Wildcard origin
 	req, _ := http.NewRequest(echo.GET, "/", nil)
 	rec := httptest.NewRecorder()
 	c := e.NewContext(req, rec)
 	h := CORS()(echo.NotFoundHandler)
-	req.Header.Set(echo.HeaderOrigin, "localhost")
-	h(c)
-	assert.Equal(t, "localhost", rec.Header().Get(echo.HeaderAccessControlAllowOrigin))
-
-	// Wildcard origin
-	req, _ = http.NewRequest(echo.GET, "/", nil)
-	rec = httptest.NewRecorder()
-	c = e.NewContext(req, rec)
-	h = CORS()(echo.NotFoundHandler)
 	h(c)
 	assert.Equal(t, "*", rec.Header().Get(echo.HeaderAccessControlAllowOrigin))
 
-	// Simple request
+	// Allow origins
 	req, _ = http.NewRequest(echo.GET, "/", nil)
 	rec = httptest.NewRecorder()
 	c = e.NewContext(req, rec)
+	h = CORSWithConfig(CORSConfig{
+		AllowOrigins: []string{"localhost"},
+	})(echo.NotFoundHandler)
 	req.Header.Set(echo.HeaderOrigin, "localhost")
-	h = CORS()(echo.NotFoundHandler)
 	h(c)
 	assert.Equal(t, "localhost", rec.Header().Get(echo.HeaderAccessControlAllowOrigin))
 

diff --git a/website/config.json b/website/config.json
@@ -1,5 +1,5 @@
 {
-  "baseurl": "https://echo.labstack.com/",
+  "baseurl": "https://echo.labstack.com",
   "languageCode": "en-us",
   "title": "Echo - Fast and unfancy HTTP server framework for Go (Golang)",
   "canonifyurls": true,

diff --git a/website/content/middleware/cors.md b/website/content/middleware/cors.md
@@ -30,41 +30,41 @@ e.Use(middleware.CORSWithConfig(middleware.CORSConfig{
 ## Configuration
 
 ```go
+// CORSConfig defines the config for CORS middleware.
 CORSConfig struct {
-    // Skipper defines a function to skip middleware.
-    Skipper Skipper
-
-    // AllowOrigin defines a list of origins that may access the resource.
-    // Optional. If request header `Origin` is set, value is []string{"<Origin>"}
-    // else []string{"*"}.
-    AllowOrigins []string `json:"allow_origins"`
-
-    // AllowMethods defines a list methods allowed when accessing the resource.
-    // This is used in response to a preflight request.
-    // Optional. Default value DefaultCORSConfig.AllowMethods.
-    AllowMethods []string `json:"allow_methods"`
-
-    // AllowHeaders defines a list of request headers that can be used when
-    // making the actual request. This in response to a preflight request.
-    // Optional. Default value []string{}.
-    AllowHeaders []string `json:"allow_headers"`
-
-    // AllowCredentials indicates whether or not the response to the request
-    // can be exposed when the credentials flag is true. When used as part of
-    // a response to a preflight request, this indicates whether or not the
-    // actual request can be made using credentials.
-    // Optional. Default value false.
-    AllowCredentials bool `json:"allow_credentials"`
-
-    // ExposeHeaders defines a whitelist headers that clients are allowed to
-    // access.
-    // Optional. Default value []string{}.
-    ExposeHeaders []string `json:"expose_headers"`
-
-    // MaxAge indicates how long (in seconds) the results of a preflight request
-    // can be cached.
-    // Optional. Default value 0.
-    MaxAge int `json:"max_age"`
+  // Skipper defines a function to skip middleware.
+  Skipper Skipper
+
+  // AllowOrigin defines a list of origins that may access the resource.
+  // Optional. Default value []string{"*"}.
+  AllowOrigins []string `json:"allow_origins"`
+
+  // AllowMethods defines a list methods allowed when accessing the resource.
+  // This is used in response to a preflight request.
+  // Optional. Default value DefaultCORSConfig.AllowMethods.
+  AllowMethods []string `json:"allow_methods"`
+
+  // AllowHeaders defines a list of request headers that can be used when
+  // making the actual request. This in response to a preflight request.
+  // Optional. Default value []string{}.
+  AllowHeaders []string `json:"allow_headers"`
+
+  // AllowCredentials indicates whether or not the response to the request
+  // can be exposed when the credentials flag is true. When used as part of
+  // a response to a preflight request, this indicates whether or not the
+  // actual request can be made using credentials.
+  // Optional. Default value false.
+  AllowCredentials bool `json:"allow_credentials"`
+
+  // ExposeHeaders defines a whitelist headers that clients are allowed to
+  // access.
+  // Optional. Default value []string{}.
+  ExposeHeaders []string `json:"expose_headers"`
+
+  // MaxAge indicates how long (in seconds) the results of a preflight request
+  // can be cached.
+  // Optional. Default value 0.
+  MaxAge int `json:"max_age"`
 }
 ```
 

diff --git a/website/data/index.toml b/website/data/index.toml
@@ -1,2 +1,27 @@
 h1 = "Echo"
 h2 = "High performance, extensible, minimalist web framework for Go"
+[[features]]
+  icon = "rocket"
+  title = "Optimized Router"
+  text = "Highly optimized HTTP router which smartly prioritize routes"
+[[features]]
+  icon = "cloud"
+  title = "RESTful API"
+  text = "Build robust and scalable RESTful API"
+[[features]]
+  icon = "license"
+  title = "Automatic TLS"
+  text = "Automatically install TLS certificates from Let's Encrypt"
+[[features]]
+  icon = "funnel"
+  title = "Middleware Levels"
+  text = "Define middleware at root, group or route level"
+[[features]]
+  icon = "sync"
+  title = "Data Binding"
+  text = "Data binding for JSON, XML and form payload"
+[[features]]
+  icon = "code"
+  title = "Templates"
+  text = "Template rendering with any template engine"
+
diff --git a/website/layouts/_default/single.html b/website/layouts/_default/single.html
@@ -5,7 +5,7 @@
   <div class="w3-main w3-padding-64">
 		{{ partial "ad.html" }}
 	  <div class="w3-row-padding">
-			<div class="w3-col m9 l9">
+			<div class="w3-col m10 l10">
 				{{ partial "notice.html" }}
         <article class="content">
           <section>

diff --git a/website/layouts/index.html b/website/layouts/index.html
@@ -7,7 +7,7 @@
 	<div class="w3-container w3-content w3-padding-64">
 		{{ partial "ad.html" }}
 	  <div class="w3-row-padding">
-			<div class="w3-col m9 l9">
+			<div class="w3-col m10 l10">
         <div class="hero">
           <h1>{{ .Site.Data.index.h1 }}</h1>
           <h2>{{ .Site.Data.index.h2 }}</h2>
@@ -23,8 +23,15 @@ <h2>{{ .Site.Data.index.h2 }}</h2>
 
         <div class="features">
           {{ range .Site.Data.index.features }}
-          <div class="feature">
-          </div>
+            <div class="feature">
+              <img src="/images/{{  .icon }}.svg">
+              <h3>
+                {{ .title }}
+              </h3>
+              <p>
+                {{ .text | safeHTML }}
+              </p>
+            </div>
           {{ end }}
         </div>
 			</div>

diff --git a/website/layouts/partials/sidenav.html b/website/layouts/partials/sidenav.html
@@ -1,4 +1,4 @@
-<nav id="sidenav" class="w3-sidenav w3-collapse">
+<nav id="sidenav" class="w3-sidenav w3-collapse w3-card-2">
   <span class="w3-closenav w3-xxlarge w3-hide-large" onclick="closeSidenav()">
     &times;
   </span>

diff --git a/website/layouts/single/single.html b/website/layouts/single/single.html
@@ -3,7 +3,7 @@
 	{{ partial "topnav.html" . }}
 	<div class="w3-container w3-content w3-padding-64">
 	  <div class="w3-row-padding">
-			<div class="w3-col m9 l9">
+			<div class="w3-col m10 l10">
         <h1>{{ .Title }}</h1>
         {{ .Content }}
 			</div>