Add easy mode (no SSL)

Author: a1div0

CHANGELOG

@@ -6,5 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.2] - 2022-02-01
+### Added
+- Easy mode (no SSL)
+
 ## [1.0.0] - 2022-02-01
 The first version has been implemented

README.md

@@ -25,7 +25,7 @@ git clone https://github.com/a1div0/https.git
 ```
 * install the `https` module using `tarantoolctl`:
 ```shell
-tarantoolctl rocks install https://raw.githubusercontent.com/a1div0/https/main/https-1.0.0-1.rockspec
+tarantoolctl rocks install https://raw.githubusercontent.com/a1div0/https/main/https-1.0.2-1.rockspec
 ```
 
 ## API

https-1.0.0-1.rockspec https-1.0.2-1.rockspechttps-1.0.0-1.rockspec renamed to https-1.0.2-1.rockspec

@@ -1,9 +1,9 @@
 package = 'https'
-version = '1.0.0-1'
+version = '1.0.2-1'
 source  = {
     url    = 'git+https://github.com/a1div0/https.git';
     branch = 'main';
-    tag = '1.0.0'
+    tag = '1.0.2'
 }
 description = {
     summary  = "Lua module HTTPS-server for Tarantool";

https/server.lua

@@ -50,18 +50,24 @@ local function ssl_listen(host, port, options)
 end
 
 local function start_ssl(self)
-    self.server = http_server_lib.new(self.options.host, self.options.port443)
-    self.server.cert_full_name = self.cert_full_name
+    if (self.ssl_enable) then
+        self.redirect = https_redirect_lib.new()
+        self.redirect:start(self.options.host, self.options.port80)
+
+        self.server = http_server_lib.new(self.options.host, self.options.port443)
+        self.server.tcp_server_f = ssl_listen
+        self.server.cert_full_name = self.cert_full_name
+
+        self.ssl_active = true
+    else
+        self.server = http_server_lib.new(self.options.host, self.options.port80)
+    end
 
     for _, tuple in ipairs(self.route_table) do
         self.server:route(tuple.options, tuple.proc)
     end
 
-    self.server.tcp_server_f = ssl_listen
     self.server:start()
-    self.redirect = https_redirect_lib.new()
-    self.redirect:start(self.options.host, self.options.port80)
-    self.ssl_active = true
 end
 
 local function stop_ssl(self)
@@ -89,16 +95,19 @@ local function setup_challenge_proc(self)
 end
 
 local function start(self)
-    update_valid_to(self)
 
-    if self.cert_need_reissue then
-        self.server = http_server_lib.new(self.options.host, self.options.port80)
-        self.server:start()
-        local proc = setup_challenge_proc(self)
-        local acme_client = acme_lib.new(self.options, proc)
-        acme_client:getCert()
-        self.server:stop()
+    if self.ssl_enable then
         update_valid_to(self)
+
+        if self.cert_need_reissue then
+            self.server = http_server_lib.new(self.options.host, self.options.port80)
+            self.server:start()
+            local proc = setup_challenge_proc(self)
+            local acme_client = acme_lib.new(self.options, proc)
+            acme_client:getCert()
+            self.server:stop()
+            update_valid_to(self)
+        end
     end
 
     start_ssl(self)
@@ -130,6 +139,7 @@ local exports = {
             start = start,
             stop = stop,
             schedule = schedule,
+            ssl_enable = options.ssl ~= false
         }
 
         self.options.internalIP4 = options.host or options.internalIP4

test/server.test.lua

@@ -6,19 +6,47 @@ local acme_lib = require("acme-client")
 local test = tap.test('https.redirect tests')
 
 local function test_main(test)
-    test:plan(10)
+
+    test:plan(12)
+
+    local function echo_proc(request)
+        local body = request:read()
+        local response = request:render{ text = body }
+        response.headers['x-test-header'] = request.method..' '..request.path;
+        response.status = 200
+        return response
+    end
 
     local options = {
-        host = '0.0.0.0',
-        port80 = 80,
+        host = '127.0.0.1',
+        port80 = 8080,
         port443 = 443,
         dns_name = 'vpoint.me',
         cert_path = '/srv/sftp/sftp-user/https/test/cert/',
         cert_name = 'ssl-test.pem',
+        ssl = false,
     }
     local cert_full_name = options.cert_path..options.cert_name
     local echo_path = '/echo'
     local echo_url = ''
+    local server = nil
+
+    if options.port80 == 80 then
+        echo_url = 'http://'..options.host..echo_path
+    else
+        echo_url = string.format('http://%s:%d%s', options.host, options.port80, echo_path)
+    end
+
+    server = https_lib.new(options)
+    server:route({ path = echo_path }, echo_proc)
+    server:start()
+
+    local r = http_client.post(echo_url, 'TEST0', {timeout=3})
+    test:is(r.status, 200, 'Check easy mode (no SSL) - status 200')
+    test:is(r.body, 'TEST0', 'Check easy mode (no SSL) - body echo')
+
+    server:stop()
+
     if options.port443 == 443 then
         echo_url = 'https://'..options.dns_name..echo_path
     else
@@ -29,13 +57,6 @@ local function test_main(test)
     local server = https_lib.new(options)
     test:isnt(server, nil, 'HTTPS-server create without cert-file')
 
-    local function echo_proc(request)
-        local response = request:render{ text = request.body }
-        response.headers['x-test-header'] = request.method..' '..request.path;
-        response.status = 200
-        return response
-    end
-
     server:route({ path = echo_path }, echo_proc)
     server:start()