Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
7883e51c
Commit
7883e51c
authored
Sep 18, 2017
by
richmidwinter
Committed by
daryl herzmann
Sep 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-159: Add an s2s testing feature (#868)
Sends an s2s ping and presents some debug info.
parent
f585057d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
271 additions
and
1 deletion
+271
-1
openfire_i18n_en.properties
src/i18n/openfire_i18n_en.properties
+5
-0
S2STestService.java
src/java/org/jivesoftware/util/S2STestService.java
+213
-0
connection-settings-socket-s2s.jsp
src/web/connection-settings-socket-s2s.jsp
+53
-1
No files found.
src/i18n/openfire_i18n_en.properties
View file @
7883e51c
...
...
@@ -1635,6 +1635,11 @@ server2server.settings.confirm.updated=Remote server information updated success
server2server.settings.confirm.allowed
=
Remote server is now allowed to connect to the server.
server2server.settings.confirm.blocked
=
Remote server is now not allowed to connect to the server.
server2server.settings.confirm.deleted
=
Remote server information was deleted.
server2server.settings.testing.boxtitle
=
Server to Server Test
server2server.settings.testing.host
=
Host
server2server.settings.testing.xmpp
=
XMPP
server2server.settings.testing.certificates
=
Certs
server2server.settings.testing.logs
=
Logs
# External component settings Page
...
...
src/java/org/jivesoftware/util/S2STestService.java
0 → 100644
View file @
7883e51c
package
org
.
jivesoftware
.
util
;
import
java.security.cert.Certificate
;
import
java.security.cert.X509Certificate
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.concurrent.Semaphore
;
import
java.util.concurrent.TimeUnit
;
import
javax.xml.bind.DatatypeConverter
;
import
org.apache.log4j.Appender
;
import
org.apache.log4j.Level
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.PatternLayout
;
import
org.apache.log4j.WriterAppender
;
import
org.apache.log4j.spi.LoggingEvent
;
import
org.jivesoftware.openfire.XMPPServer
;
import
org.jivesoftware.openfire.handler.IQPingHandler
;
import
org.jivesoftware.openfire.interceptor.InterceptorManager
;
import
org.jivesoftware.openfire.interceptor.PacketInterceptor
;
import
org.jivesoftware.openfire.interceptor.PacketRejectedException
;
import
org.jivesoftware.openfire.session.OutgoingServerSession
;
import
org.jivesoftware.openfire.session.Session
;
import
org.slf4j.LoggerFactory
;
import
org.xmpp.packet.IQ
;
import
org.xmpp.packet.IQ.Type
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.Packet
;
/**
* Runs server to server test.
*
* Attempts to send an IQ packet to ping a given domain. Captures debug information from logging, certificates and
* packets.
*/
public
class
S2STestService
{
private
static
final
org
.
slf4j
.
Logger
Log
=
LoggerFactory
.
getLogger
(
S2STestService
.
class
);
private
Semaphore
waitUntil
;
private
String
domain
;
/**
* @param domain The host to test.
*/
public
S2STestService
(
String
domain
)
{
this
.
domain
=
domain
;
}
/**
* Run a test against the domain.
* @return K-V pairs of debug information.
* @throws Exception On error.
*/
public
Map
<
String
,
String
>
run
()
throws
Exception
{
waitUntil
=
new
Semaphore
(
0
);
Map
<
String
,
String
>
results
=
new
HashMap
<>();
// Tear down existing routes.
XMPPServer
.
getInstance
().
getRoutingTable
().
removeServerRoute
(
new
JID
(
domain
));
// Intercept logging.
final
StringBuilder
logs
=
new
StringBuilder
();
Appender
appender
=
interceptLogging
(
logs
);
// Intercept packets.
PacketInterceptor
interceptor
=
new
S2SInterceptor
();
InterceptorManager
.
getInstance
().
addInterceptor
(
interceptor
);
// Send ping.
Log
.
info
(
"Sending server to server ping request to "
+
domain
);
sendPing
();
// Wait for success or exceed socket 5s timeout.
waitUntil
.
tryAcquire
(
6
,
TimeUnit
.
SECONDS
);
// Check on the connection status.
logSessionStatus
();
// Prepare response.
results
.
put
(
"certs"
,
getCertificates
());
results
.
put
(
"stanzas"
,
interceptor
.
toString
());
results
.
put
(
"logs"
,
logs
.
toString
());
// Cleanup
InterceptorManager
.
getInstance
().
removeInterceptor
(
interceptor
);
Logger
.
getRootLogger
().
removeAppender
(
appender
);
return
results
;
}
/**
* Begins intercepting logging.
*
* @param logs The StringBuilder to collect log output.
* @return A reference to the log4j appender which receives log output.
*/
private
Appender
interceptLogging
(
final
StringBuilder
logs
)
{
WriterAppender
appender
=
new
WriterAppender
()
{
@Override
public
void
append
(
LoggingEvent
event
)
{
logs
.
append
(
String
.
format
(
"%s: %s: %s\n"
,
new
Date
(
event
.
getTimeStamp
()).
toString
(),
event
.
getLevel
().
toString
(),
event
.
getRenderedMessage
()));
String
[]
throwableInfo
=
event
.
getThrowableStrRep
();
if
(
throwableInfo
!=
null
)
{
for
(
String
line
:
throwableInfo
)
{
logs
.
append
(
line
+
"\n"
);
}
}
}
};
appender
.
setLayout
(
new
PatternLayout
(
"%d [%p|%c|%C{1}] %m%n"
));
appender
.
setThreshold
(
Level
.
ALL
);
appender
.
activateOptions
();
Logger
.
getRootLogger
().
addAppender
(
appender
);
return
appender
;
}
/**
* Logs the status of the session.
*/
private
void
logSessionStatus
()
{
OutgoingServerSession
session
=
XMPPServer
.
getInstance
().
getSessionManager
().
getOutgoingServerSession
(
domain
);
if
(
session
!=
null
)
{
int
connectionStatus
=
session
.
getStatus
();
switch
(
connectionStatus
)
{
case
Session
.
STATUS_CONNECTED
:
Log
.
info
(
"Session is connected."
);
break
;
case
Session
.
STATUS_CLOSED
:
Log
.
info
(
"Session is closed."
);
break
;
case
Session
.
STATUS_AUTHENTICATED
:
Log
.
info
(
"Session is authenticated."
);
break
;
}
}
else
{
Log
.
info
(
"Failed to establish server to server session."
);
}
}
/**
* Sends a server to server ping request.
*/
private
void
sendPing
()
{
final
IQ
pingRequest
=
new
IQ
(
Type
.
get
);
pingRequest
.
setChildElement
(
"ping"
,
IQPingHandler
.
NAMESPACE
);
pingRequest
.
setFrom
(
XMPPServer
.
getInstance
().
getServerInfo
().
getXMPPDomain
());
pingRequest
.
setTo
(
domain
);
XMPPServer
.
getInstance
().
getIQRouter
().
route
(
pingRequest
);
}
/**
* @return A String representation of the certificate chain for the connection to the domain under test.
*/
private
String
getCertificates
()
{
Session
session
=
XMPPServer
.
getInstance
().
getSessionManager
().
getOutgoingServerSession
(
domain
);
StringBuilder
certs
=
new
StringBuilder
();
if
(
session
!=
null
)
{
Log
.
info
(
"Successfully negotiated TLS connection."
);
Certificate
[]
certificates
=
session
.
getPeerCertificates
();
for
(
Certificate
certificate
:
certificates
)
{
certs
.
append
(((
X509Certificate
)
certificate
).
getSubjectDN
());
certs
.
append
(
'\n'
);
certs
.
append
(
"-----BEGIN CERTIFICATE-----\n"
);
certs
.
append
(
DatatypeConverter
.
printBase64Binary
(
certificate
.
getPublicKey
().
getEncoded
()).
replaceAll
(
"(.{64})"
,
"$1\n"
));
certs
.
append
(
"\n-----END CERTIFICATE-----\n"
);
}
}
return
certs
.
toString
();
}
/**
* Packet interceptor for the duration of our S2S test.
*/
private
class
S2SInterceptor
implements
PacketInterceptor
{
private
StringBuilder
xml
=
new
StringBuilder
();
/**
* Keeps a log of the XMPP traffic, releasing the wait lock on response received.
*/
@Override
public
void
interceptPacket
(
Packet
packet
,
Session
session
,
boolean
incoming
,
boolean
processed
)
throws
PacketRejectedException
{
if
(!
processed
&&
(
domain
.
equals
(
packet
.
getFrom
().
getDomain
())
||
domain
.
equals
(
packet
.
getTo
().
getDomain
())))
{
xml
.
append
(
packet
.
toXML
());
xml
.
append
(
'\n'
);
// If we've received our IQ response, stop waiting.
if
(
domain
.
equals
(
packet
.
getFrom
().
getDomain
())
&&
"result"
.
equals
(
packet
.
getElement
().
attributeValue
(
"type"
)))
{
Log
.
info
(
"Successful server to server response received."
);
waitUntil
.
release
();
}
}
}
/**
* Returns the received stanzas as a String.
*/
public
String
toString
()
{
return
xml
.
toString
();
}
}
}
src/web/connection-settings-socket-s2s.jsp
View file @
7883e51c
...
...
@@ -10,6 +10,7 @@
<%@ page
import=
"org.jivesoftware.openfire.server.RemoteServerManager"
%>
<%@ page
import=
"org.jivesoftware.openfire.server.RemoteServerConfiguration"
%>
<%@ page
import=
"org.jivesoftware.util.StringUtils"
%>
<%@ page
import=
"org.jivesoftware.util.S2STestService"
%>
<%@ page
errorPage=
"error.jsp"
%>
<%@ taglib
uri=
"admin"
prefix=
"admin"
%>
...
...
@@ -31,6 +32,8 @@
boolean
serverBlocked
=
request
.
getParameter
(
"serverBlocked"
)
!=
null
;
boolean
permissionUpdate
=
request
.
getParameter
(
"permissionUpdate"
)
!=
null
;
String
configToDelete
=
ParamUtils
.
getParameter
(
request
,
"deleteConf"
);
String
s2sTestingDomain
=
ParamUtils
.
getParameter
(
request
,
"server2server-testing-domain"
);
boolean
s2sTest
=
request
.
getParameter
(
"s2s-test"
)
!=
null
&&
s2sTestingDomain
!=
null
;
final
Map
<
String
,
String
>
errors
=
new
HashMap
<
>
();
Cookie
csrfCookie
=
CookieUtils
.
getCookie
(
request
,
"csrf"
);
...
...
@@ -50,7 +53,17 @@
CookieUtils
.
setCookie
(
request
,
response
,
"csrf"
,
csrfParam
,
-
1
);
pageContext
.
setAttribute
(
"csrf"
,
csrfParam
);
if
(
update
&&
errors
.
isEmpty
()
)
if
(
s2sTest
)
{
Map
<
String
,
String
>
results
=
new
S2STestService
(
s2sTestingDomain
).
run
();
pageContext
.
setAttribute
(
"s2sDomain"
,
s2sTestingDomain
);
pageContext
.
setAttribute
(
"s2sTest"
,
true
);
pageContext
.
setAttribute
(
"stanzas"
,
results
.
get
(
"stanzas"
));
pageContext
.
setAttribute
(
"logs"
,
results
.
get
(
"logs"
));
pageContext
.
setAttribute
(
"certs"
,
results
.
get
(
"certs"
));
}
else
if
(
update
&&
errors
.
isEmpty
()
)
{
// plaintext
final
boolean
plaintextEnabled
=
ParamUtils
.
getBooleanParameter
(
request
,
"plaintext-enabled"
);
...
...
@@ -495,5 +508,44 @@
</admin:contentBox>
<!-- END 'Not Allowed to Connect' -->
<!-- BEGIN 'S2S Testing' -->
<fmt:message
key=
"server2server.settings.testing.boxtitle"
var=
"s2sTitle"
/>
<admin:contentBox
title=
"
${
s2sTitle
}
"
>
<form
action=
"connection-settings-socket-s2s.jsp"
method=
"post"
>
<table
cellpadding=
"3"
cellspacing=
"0"
border=
"0"
>
<tr
valign=
"middle"
>
<td
width=
"1%"
nowrap
><label
for=
"server2server-testing-domain"
><fmt:message
key=
"server2server.settings.testing.host"
/></label></td>
<td
width=
"99%"
>
<input
type=
"text"
name=
"server2server-testing-domain"
id=
"server2server-testing-domain"
value=
"${s2sDomain}"
>
<input
type=
"submit"
name=
"s2s-test"
value=
"
<fmt:message
key=
"global.test"
/>
"
>
</td>
</tr>
<c:if
test=
"
${
s2sTest
}
"
>
<tr
valign=
"middle"
>
<td
width=
"1%"
nowrap
><label
for=
"server2server-testing-stanzas"
><fmt:message
key=
"server2server.settings.testing.xmpp"
/></label></td>
<td
width=
"99%"
>
<textarea
name=
"server2server-testing-stanzas"
style=
"width: 100%"
rows=
"12"
><c:out
value=
"
${
stanzas
}
"
/></textarea>
</td>
</tr>
<tr
valign=
"middle"
>
<td
width=
"1%"
nowrap
><label
for=
"server2server-testing-certs"
><fmt:message
key=
"server2server.settings.testing.certificates"
/></label></td>
<td
width=
"99%"
>
<textarea
name=
"server2server-testing-certs"
style=
"width: 100%"
rows=
"12"
><c:out
value=
"
${
certs
}
"
/></textarea>
</td>
</tr>
<tr
valign=
"middle"
>
<td
width=
"1%"
nowrap
><label
for=
"server2server-testing-logs"
><fmt:message
key=
"server2server.settings.testing.logs"
/></label></td>
<td
width=
"99%"
>
<textarea
name=
"server2server-testing-logs"
style=
"width: 100%"
rows=
"12"
><c:out
value=
"
${
logs
}
"
/></textarea>
</td>
</tr>
</c:if>
</table>
</form>
</admin:contentBox>
<!-- END 'S2S Testing' -->
</body>
</html>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment