From 0b9b5baa495aa05e802ebb476521725ad94ecab3 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Thu, 10 Aug 2017 16:19:58 +0800
Subject: [PATCH] =?UTF-8?q?HTTP=E6=9C=8D=E5=8A=A1=E5=A2=9E=E5=8A=A0OPTIONS?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/META-INF/application-template.xml            |  6 ++++--
 src/org/redkale/net/http/HttpPrepareServlet.java |  4 ++++
 src/org/redkale/net/http/HttpResponse.java       | 13 +++++++++++--
 src/org/redkale/net/http/HttpServer.java         |  9 ++++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 140a811c4..6bd556fde 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -211,12 +211,14 @@
            如果addheader、setheader 的value值以request.parameters.开头则表示从request.parameters中获取对应的parameter值
            如果addheader、setheader 的value值以request.headers.开头则表示从request.headers中获取对应的header值
            例如下面例子是在Response输出header时添加两个header（一个addHeader， 一个setHeader）。
+           options 节点: 设置了该节点却auto=true，当request的method=OPTIONS自动设置addheader、setheader并返回200状态码
         -->
         <response>
-            <defcookie domain="" path=""/>
+            <defcookie domain="" path=""/>  
             <addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" /> 
             <setheader name="Access-Control-Allow-Headers" value="request.headers.Access-Control-Request-Headers"/>
-            <setheader name="Access-Control-Allow-Credentials" value="true"/>  
+            <setheader name="Access-Control-Allow-Credentials" value="true"/>
+            <options auto="true" />
         </response>
             
         <!-- 
diff --git a/src/org/redkale/net/http/HttpPrepareServlet.java b/src/org/redkale/net/http/HttpPrepareServlet.java
index 4cb26b257..4f9e538fb 100644
--- a/src/org/redkale/net/http/HttpPrepareServlet.java
+++ b/src/org/redkale/net/http/HttpPrepareServlet.java
@@ -235,6 +235,10 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
         try {
             final String uri = request.getRequestURI();
             HttpServlet servlet;
+            if (response.isAutoOptions() && "OPTIONS".equals(request.getMethod())) {
+                response.finish(200, null);
+                return;
+            }
             if (request.isWebSocket()) {
                 servlet = wsmappings.get(uri);
                 if (servlet == null && this.regWsArray != null) {
diff --git a/src/org/redkale/net/http/HttpResponse.java b/src/org/redkale/net/http/HttpResponse.java
index b195954a6..3e6d38188 100644
--- a/src/org/redkale/net/http/HttpResponse.java
+++ b/src/org/redkale/net/http/HttpResponse.java
@@ -125,17 +125,21 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
 
     private final String[][] defaultSetHeaders;
 
+    private final boolean autoOptions;
+
     private final HttpCookie defcookie;
 
     public static ObjectPool<Response> createPool(AtomicLong creatCounter, AtomicLong cycleCounter, int max, Creator<Response> creator) {
         return new ObjectPool<>(creatCounter, cycleCounter, max, creator, (x) -> ((HttpResponse) x).prepare(), (x) -> ((HttpResponse) x).recycle());
     }
 
-    public HttpResponse(HttpContext context, HttpRequest request, String[][] defaultAddHeaders, String[][] defaultSetHeaders, HttpCookie defcookie) {
+    public HttpResponse(HttpContext context, HttpRequest request, String[][] defaultAddHeaders, String[][] defaultSetHeaders,
+        HttpCookie defcookie, boolean autoOptions) {
         super(context, request);
         this.defaultAddHeaders = defaultAddHeaders;
         this.defaultSetHeaders = defaultSetHeaders;
         this.defcookie = defcookie;
+        this.autoOptions = autoOptions;
     }
 
     @Override
@@ -185,6 +189,10 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         this.servlet = servlet;
     }
 
+    protected boolean isAutoOptions() {
+        return this.autoOptions;
+    }
+
     /**
      * 增加Cookie值
      *
@@ -439,6 +447,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         if (isClosed()) return;
         if (this.recycleListener != null) this.output = obj;
         if (obj == null || obj.isEmpty()) {
+            this.contentLength = 0;
             final ByteBuffer headbuf = createHeader();
             headbuf.flip();
             super.finish(headbuf);
@@ -754,7 +763,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
 
         buffer.put(("Content-Type: " + (this.contentType == null ? "text/plain; charset=utf-8" : this.contentType) + "\r\n").getBytes());
 
-        if (this.contentLength > 0) {
+        if (this.contentLength >= 0) {
             buffer.put(("Content-Length: " + this.contentLength + "\r\n").getBytes());
         }
         if (!this.request.isKeepAlive()) {
diff --git a/src/org/redkale/net/http/HttpServer.java b/src/org/redkale/net/http/HttpServer.java
index 695a9c1ef..0c063d4a7 100644
--- a/src/org/redkale/net/http/HttpServer.java
+++ b/src/org/redkale/net/http/HttpServer.java
@@ -280,6 +280,8 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
             });
         final List<String[]> defaultAddHeaders = new ArrayList<>();
         final List<String[]> defaultSetHeaders = new ArrayList<>();
+        boolean autoOptions = false;
+
         HttpCookie defaultCookie = null;
         String remoteAddrHeader = null;
         if (config != null) {
@@ -342,10 +344,15 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
                         defaultCookie.setPath(path);
                     }
                 }
+                AnyValue options = resps == null ? null : resps.getAnyValue("options");
+                autoOptions = options != null && options.getBoolValue("auto", false);
             }
+
         }
         final String[][] addHeaders = defaultAddHeaders.isEmpty() ? null : defaultAddHeaders.toArray(new String[defaultAddHeaders.size()][]);
         final String[][] setHeaders = defaultSetHeaders.isEmpty() ? null : defaultSetHeaders.toArray(new String[defaultSetHeaders.size()][]);
+        final boolean options = autoOptions;
+
         final HttpCookie defCookie = defaultCookie;
         final String addrHeader = remoteAddrHeader;
         AtomicLong createResponseCounter = new AtomicLong();
@@ -353,7 +360,7 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
         ObjectPool<Response> responsePool = HttpResponse.createPool(createResponseCounter, cycleResponseCounter, this.responsePoolSize, null);
         HttpContext httpcontext = new HttpContext(this.serverStartTime, this.logger, executor, rcapacity, bufferPool, responsePool,
             this.maxbody, this.charset, this.address, this.prepare, this.readTimeoutSecond, this.writeTimeoutSecond);
-        responsePool.setCreator((Object... params) -> new HttpResponse(httpcontext, new HttpRequest(httpcontext, addrHeader), addHeaders, setHeaders, defCookie));
+        responsePool.setCreator((Object... params) -> new HttpResponse(httpcontext, new HttpRequest(httpcontext, addrHeader), addHeaders, setHeaders, defCookie, options));
         return httpcontext;
     }