Changeset 3c4929015c7e763c1aa84c4ecf095f93e09a936f

Timestamp:

09/27/11 06:28:12 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1317104892 -0400

git-parent:

[559e017dc530d5467cb14742be11d9f328bf4e01], [4d67783cefed3fcbb1d0054cfd469b63262bc00c]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1317104892 -0400

Message:

Merge branch 'master' of github.com:omniti-labs/reconnoiter

Files:

• src/modules-lua/noit/module/tcp.lua (modified) (3 diffs)

src/modules-lua/noit/module/tcp.lua

@@ -44 +44 @@
-    <parameter name="banner_match" required="optional"
-              allowed=".+">This regular expression is matched against the response banner.  If a match is not found, the check will be marked as bad.</parameter>
+  <parameter name="send_body" required="optional"
+            allowed=".+">Data to send on the socket once connected and optionally SSL is negotiated, but before the body match is tested.</parameter>
+  <parameter name="body_match" required="optional"
+            allowed=".+">This regular expression is matched against the body (the leftover data up to 1024 bytes) after the banner.</parameter>
-    <parameter name="use_ssl" required="optional" allowed="^(?:true|false|on|off)$" default="false">Upgrade TCP connection to use SSL.</parameter>
-    <parameter name="ca_chain"
@@ -177 +181 @@
-  end
-
+  if check.config.send_body ~= nil then
+    if e:write(check.config.send_body) < 0 then
+      check.bad()
+      check.status("send_body: received hangup")
+      return
+    end
+  end
-
-  -- match banner
@@ -205 +216 @@
-  end
-
+  -- match body
+  if check.config.body_match ~= nil then
+    str = e:read(1024)
+    if str == nil then
+      check.status("bad body length " .. (str and str:len() or "0"))
+      return
+    end
+    local bodybytetime = noit.timeval.now()
+    elapsed(check, "tt_body", starttime, bodybytetime)
+
+    local exre = noit.pcre(check.config.body_match)
+    local rv = true
+    local found = false
+    local m = nil
+    while rv and m ~= '' do
+      rv, m, key, value = exre(str or '', { limit = pcre_match_limit })
+      if rv then
+        found = true
+        if key ~= nil then
+          check.metric(key, value)
+        end
+      end
+    end
+
+    if found then
+      status = status .. ',body_match=matched'
+    else
+      good = false
+      status = status .. ',body_match=failed'
+    end
+
+    check.metric_string('body',str)
+  end
+
-  -- turnaround time
-  local endtime = noit.timeval.now()