mirror of
https://github.com/kevin-DL/revel-cmd.git
synced 2026-01-12 11:05:19 +00:00
Compare commits
11 Commits
v1.1.4
...
server-eng
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18e6b92704 | ||
|
|
49041fb83d | ||
|
|
f86def601d | ||
|
|
15875dc9a1 | ||
|
|
16f98f92e0 | ||
|
|
9de11613ce | ||
|
|
32d1f12b51 | ||
|
|
d114a92b3d | ||
|
|
8bf654d8b0 | ||
|
|
79ed869901 | ||
|
|
3ba212afb4 |
@@ -47,10 +47,12 @@ type Harness struct {
|
|||||||
proxy *httputil.ReverseProxy
|
proxy *httputil.ReverseProxy
|
||||||
}
|
}
|
||||||
|
|
||||||
func renderError(w http.ResponseWriter, r *http.Request, err error) {
|
func renderError(iw http.ResponseWriter, ir *http.Request, err error) {
|
||||||
req, resp := revel.NewRequest(r), revel.NewResponse(w)
|
context := revel.NewGOContext(nil)
|
||||||
c := revel.NewController(req, resp)
|
context.Request.SetRequest(ir)
|
||||||
c.RenderError(err).Apply(req, resp)
|
context.Response.SetResponse(iw)
|
||||||
|
c := revel.NewController(context)
|
||||||
|
c.RenderError(err).Apply(c.Request, c.Response)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServeHTTP handles all requests.
|
// ServeHTTP handles all requests.
|
||||||
|
|||||||
@@ -160,8 +160,20 @@ func ProcessSource(roots []string) (*SourceInfo, *revel.Error) {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ignore packages that end with _test
|
||||||
|
for i := range pkgs {
|
||||||
|
if len(i) > 6 {
|
||||||
|
if string(i[len(i)-5:]) == "_test" {
|
||||||
|
delete(pkgs, i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// There should be only one package in this directory.
|
// There should be only one package in this directory.
|
||||||
if len(pkgs) > 1 {
|
if len(pkgs) > 1 {
|
||||||
|
for i := range pkgs {
|
||||||
|
println("Found package ", i)
|
||||||
|
}
|
||||||
log.Println("Most unexpected! Multiple packages in a single directory:", pkgs)
|
log.Println("Most unexpected! Multiple packages in a single directory:", pkgs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,12 @@ func parseRunArgs(args []string) *RunArgs {
|
|||||||
// 1. revel run [import-path]
|
// 1. revel run [import-path]
|
||||||
// 2. revel run [port]
|
// 2. revel run [port]
|
||||||
// 3. revel run [run-mode]
|
// 3. revel run [run-mode]
|
||||||
if _, err := build.Import(args[0], "", build.FindOnly); err == nil {
|
_, err := build.Import(args[0], "", build.FindOnly)
|
||||||
|
if err != nil {
|
||||||
|
revel.WARN.Printf("Unable to run using an import path, assuming import path is working directory %s %s", args[0], err.Error())
|
||||||
|
}
|
||||||
|
println("Trying to build with", args[0], err)
|
||||||
|
if err == nil {
|
||||||
// 1st arg is the import path
|
// 1st arg is the import path
|
||||||
inputArgs.ImportPath = args[0]
|
inputArgs.ImportPath = args[0]
|
||||||
} else if port, err := strconv.Atoi(args[0]); err == nil {
|
} else if port, err := strconv.Atoi(args[0]); err == nil {
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ func init() {
|
|||||||
revel.ActionInvoker, // Invoke the action.
|
revel.ActionInvoker, // Invoke the action.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// register startup functions with OnAppStart
|
// register startup functions with OnAppStart
|
||||||
// revel.DevMode and revel.RunMode only work inside of OnAppStart. See Example Startup Script
|
// revel.DevMode and revel.RunMode only work inside of OnAppStart. See Example Startup Script
|
||||||
// ( order dependent )
|
// ( order dependent )
|
||||||
@@ -43,9 +42,9 @@ func init() {
|
|||||||
// should probably also have a filter for CSRF
|
// should probably also have a filter for CSRF
|
||||||
// not sure if it can go in the same filter or not
|
// not sure if it can go in the same filter or not
|
||||||
var HeaderFilter = func(c *revel.Controller, fc []revel.Filter) {
|
var HeaderFilter = func(c *revel.Controller, fc []revel.Filter) {
|
||||||
c.Response.Out.Header().Add("X-Frame-Options", "SAMEORIGIN")
|
c.Response.SetHttpHeader("X-Frame-Options", "SAMEORIGIN")
|
||||||
c.Response.Out.Header().Add("X-XSS-Protection", "1; mode=block")
|
c.Response.SetHttpHeader("X-XSS-Protection", "1; mode=block")
|
||||||
c.Response.Out.Header().Add("X-Content-Type-Options", "nosniff")
|
c.Response.SetHttpHeader("X-Content-Type-Options", "nosniff")
|
||||||
|
|
||||||
fc[0](c, fc[1:]) // Execute the next filter stage.
|
fc[0](c, fc[1:]) // Execute the next filter stage.
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user