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
3e4392a4
Commit
3e4392a4
authored
Dec 08, 2015
by
Guus der Kinderen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-793: Don't send data upon STARTTLS Negotiation failure.
parent
c2740984
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
10 deletions
+13
-10
LocalOutgoingServerSession.java
...software/openfire/session/LocalOutgoingServerSession.java
+13
-10
No files found.
src/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
View file @
3e4392a4
...
...
@@ -331,19 +331,22 @@ public class LocalOutgoingServerSession extends LocalServerSession implements Ou
connection
.
close
();
}
}
catch
(
SSLHandshakeException
e
)
{
Log
.
debug
(
"LocalOutgoingServerSession: Handshake error while creating secured outgoing session to remote "
+
"server: "
+
hostname
+
"(DNS lookup: "
+
realHostname
+
":"
+
realPort
+
"):"
,
e
);
// Close the connection
catch
(
SSLHandshakeException
e
)
{
// This is a failure as described in RFC3620, section 5.4.3.2 "STARTTLS Failure".
Log
.
info
(
"STARTTLS negotiation (with {} at {}:{}) failed."
,
hostname
,
realHostname
,
realPort
,
e
);
// The receiving entity is expected to close the socket *without* sending any more data (<failure/> nor </stream>).
// It is probably (see OF-794) best if we, as the initiating entity, therefor don't send any data either.
if
(
connection
!=
null
)
{
connection
.
c
lose
();
connection
.
forceC
lose
();
}
}
catch
(
Exception
e
)
{
Log
.
error
(
"Error creating secured outgoing session to remote server: "
+
hostname
+
"(DNS lookup: "
+
realHostname
+
":"
+
realPort
+
")"
,
e
);
// Close the connection
catch
(
Exception
e
)
{
// This might be RFC3620, section 5.4.2.2 "Failure Case" or even an unrelated problem. Handle 'normally'.
Log
.
warn
(
"An exception occurred while creating an encrypted session (with {} at {}:{})"
,
hostname
,
realHostname
,
realPort
,
e
);
if
(
connection
!=
null
)
{
connection
.
close
();
}
...
...
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