aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-07 12:43:00 +0200
committerKim Alvefur <zash@zash.se>2013-10-07 12:43:00 +0200
commit5178a1e79fed67890c26d0f9a052c70b6a36b5a6 (patch)
tree494c932b4f325d2782070e6e6603a9960f9c6743
parent04699a3aa4f2f86e841941ad49a02d2f5f21f8fc (diff)
downloadprosody-5178a1e79fed67890c26d0f9a052c70b6a36b5a6.tar.gz
prosody-5178a1e79fed67890c26d0f9a052c70b6a36b5a6.zip
mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encrypted (eg consider_bosh_secure)
-rw-r--r--plugins/mod_c2s.lua2
-rw-r--r--plugins/mod_s2s/mod_s2s.lua1
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua1
3 files changed, 4 insertions, 0 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 1fb8dcf5..3bdffc7d 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -69,6 +69,7 @@ function stream_callbacks.streamopened(session, attr)
-- since we now have a new stream header, session is secured
if session.secure == false then
session.secure = true;
+ session.encrypted = true;
local sock = session.conn:socket();
if sock.info then
@@ -209,6 +210,7 @@ function listener.onconnect(conn)
-- Client is using legacy SSL (otherwise mod_tls sets this flag)
if conn:ssl() then
session.secure = true;
+ session.encrypted = true;
-- Check if TLS compression is used
local sock = conn:socket();
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 1d03f3e4..5afb958c 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -283,6 +283,7 @@ function stream_callbacks.streamopened(session, attr)
-- TODO: Rename session.secure to session.encrypted
if session.secure == false then
session.secure = true;
+ session.encrypted = true;
local sock = session.conn:socket();
if sock.info then
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index ec8ea4d4..dbbef360 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -270,6 +270,7 @@ function s2sout.make_connect(host_session, connect_host, connect_port)
-- Reset secure flag in case this is another
-- connection attempt after a failed STARTTLS
host_session.secure = nil;
+ host_session.encrypted = nil;
local conn, handler;
local proto = connect_host.proto;