Commits · 052ede3fb45ec9587e297672ca494d5aa1186394 · Administrator / Openfire

06 Jan, 2016 21 commits

Merge pull request #494 from tevans/websocket-cleanup · 052ede3f
Guus der Kinderen authored Jan 06, 2016
```
Cleanup websocket plugin
```
052ede3f

Tom Evans authored Jan 06, 2016

Update dependencies and documentation to prep for pending Openfire 4.0
release.

403e3a75

Merge pull request #493 from guusdk/OF-1028 · 7768e4fb
Dave Cridland authored Jan 06, 2016
```
OF-1028 Stream Management refactoring
```
7768e4fb
OF-1028: Don't forget to register client ack. · c8269f66
Guus der Kinderen authored Jan 06, 2016

c8269f66

OF-1028: Prevent immediate re-request for ack. · 1a1efa27

Guus der Kinderen authored Jan 06, 2016

Instead of rerequesting ack for every unack'ed stanza over the
threshold, do this only for every few stanzas. This prevents a storm
of ack-requests when data is transmitted to the client faster than it
can respond.

1a1efa27

OF-1028: Restrict the amount of data in memory. · 3bb6ab49

Guus der Kinderen authored Jan 06, 2016

When a peer refuses to ack data, we should not keep it in memory
indefinately. This commit introduces a configurable upper bound,
and when reached causes the queue to be cleared (dropped silently)
while disabling the functionality for that connection.

3bb6ab49

OF-1028: Request ack only when unack'ed stanzas exist. · 422e7ff6

Guus der Kinderen authored Jan 06, 2016

The peer might send unsollicited acks. Instead of requesting ack after every
so many stanzas that we send out, only request ack if we have unack'ed stanzas.

422e7ff6

OF-1028: Rollover should occur at 2^32 · c1b3f28f
Guus der Kinderen authored Jan 06, 2016
```
This commit fixes an overflow issue.
```
c1b3f28f

OF-1028: Store X with each unack'ed stanza · c3ed050a

Guus der Kinderen authored Jan 06, 2016

To safely determine what stanza has and has not been ack'ed by the peer,
store the current value of 'x' with each stanza that's kept. This also
allows for proper handling when the peer rolls over X (at x=2^32).

c3ed050a

OF-1028: Prevent access to internal state. · 231e73ac

Guus der Kinderen authored Jan 06, 2016

Previous commits have applied enough refactoring that it is now no
longer needed to expose internal state. This saves on complexity and
potential concurrency issues.

231e73ac

OF-1028: Remove unused field · 2527acb8

Guus der Kinderen authored Jan 06, 2016

The 'enabled' field is unneeded - the presence of a namespace also
indicates if SM is enabled. Reduces code, saves a little on memory.

2527acb8

OF-1028: Reduce duplicate code · e62c04d9

Guus der Kinderen authored Jan 06, 2016

By moving the processing of Stream Management elements into the
StreamManager implementation, duplicated code can be removed.

e62c04d9

OF-1028: Synchronized block scope should be minimal. · 8e06f9dc

Guus der Kinderen authored Jan 06, 2016

To reduce the chance of lock contention, locks should only be put
in effect when the code accesses data that is sensitive to concurrent
access.

8e06f9dc

OF-1028: Avoid potential concurrency issue. · 3b5e22bb

Guus der Kinderen authored Jan 06, 2016

Prevent exposing access to a field that we're careful to modify
under lock. Again, a defensive copy is a suitable alternative,
but seems unneeded.

3b5e22bb

OF-1028: Avoid potential concurrency issue. · bac4c600

Guus der Kinderen authored Jan 06, 2016

Do not expose the collection of packets that our implementation
modifies only under a mutex (alternatively, we could return a
defensive copy instead, but there does not seem to be a need
to expose the collection in the first place).

bac4c600

OF-1028: Logging should have context · 2889dfcd

Guus der Kinderen authored Jan 06, 2016

Stream (debug) logging is very verbose, but does not provide any context.
This commit adds the address of the peer to each log message.
Additionally, some javadoc fixes were applied.

2889dfcd

Merge pull request #492 from sco0ter/smDelay · 8d2f0722
Guus der Kinderen authored Jan 06, 2016
```
Don't add multiple delayed delivery extension to resent messages.
```
8d2f0722
Merge pull request #490 from sco0ter/websocket · 5b11857d
Dave Cridland authored Jan 06, 2016
```
WebSocket plugin: Fix wrong namespace adding to empty elements
```
5b11857d

Don't add multiple delayed delivery extension to resent messages. · 81363d82

Christian Schudt authored Jan 06, 2016

The issue is that messages, which get resent from offline storage already have an older timestamp.

There should not be another delayed delivery extension, which "overwrites" the old one.

Messages looked like that:
<message><body>...</body><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:48:45.312Z"></delay><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:49:56.674Z"></delay></message>

Instead the original timestamp should be preserved.

81363d82

WebSocket plugin: Fix wrong namespace adding to empty elements · 3a3faad1

Christian Schudt authored Jan 06, 2016

The old logic produced XML like:
<presence xmlns="jabber:client" from="..." to="..."><show xmlns="">xa</show><status xmlns=""/></presence>

This is basically the same fix as in 6965c13e.

Relates to OF-938.

3a3faad1

Merge pull request #488 from guusdk/logging · 632eec6f
Dave Cridland authored Jan 06, 2016
```
Remove verbose logging
```
632eec6f

05 Jan, 2016 17 commits

Merge pull request #489 from guusdk/OF-1009 · 4e8614b1
Tom Evans authored Jan 05, 2016
```
OF-1009: Allow non-TLS dialback
```
4e8614b1
OF-1009: Allow non-TLS dialback · 37588e0f
Guus der Kinderen authored Jan 05, 2016
```
When a TLS failure occurs during dialback, allow for a non-TLS
based fallback.
```
37588e0f

Remove verbose logging · 66e91ee3

Guus der Kinderen authored Jan 05, 2016

This class logged to debug on any property change (including properties
that do not relate to the class itself).

66e91ee3

Merge pull request #479 from guusdk/s2s · 056012e1
Dave Cridland authored Jan 05, 2016
```
S2S logging
```
056012e1
Merge pull request #481 from tevans/OF-1023 · 39d00f52
Dave Cridland authored Jan 05, 2016
```
OF-1023: Fire contactChanged/Deleted events
```
39d00f52
Merge pull request #483 from guusdk/OF-999 · f6f3df47
Dave Cridland authored Jan 05, 2016
```
OF-999: Allow configuration of BOSH worker thread pool
```
f6f3df47
Merge pull request #485 from guusdk/OF-998 · 5fd38241
Dave Cridland authored Jan 05, 2016
```
OF-998: Ant should resolve DTDs locally
```
5fd38241
Merge pull request #487 from guusdk/OF-1025 · 20eb8c48
Dave Cridland authored Jan 05, 2016
```
OF-1025: Restore web-custom.xml functionality
```
20eb8c48
Merge pull request #484 from guusdk/OF-1000 · f77c0399
Tom Evans authored Jan 05, 2016
```
OF-1000 Prevent NPE and improve logging
```
f77c0399
Merge pull request #474 from anuko/master · aa0cf333
Tom Evans authored Jan 05, 2016
```
Fixed group population for colliding full names.
```
aa0cf333
Merge pull request #478 from tevans/OF-122 · bdef6ba7
Tom Evans authored Jan 05, 2016
```
OF-122: MUC subject change policy
```
bdef6ba7
Merge pull request #473 from ishmakov/invitationrejection-delegate · a1c498cd
Tom Evans authored Jan 05, 2016
```
MUC Invitation rejection delegate call
```
a1c498cd

OF-1025: Restore web-custom.xml functionality · 770fee82

Guus der Kinderen authored Jan 05, 2016

For some reason, XPath-based selection of nodes no longer works. Traversing
the Dom4j object resolves that problem.

770fee82

Merge pull request #480 from guusdk/random · 736b76f1
Dave Cridland authored Jan 05, 2016
```
Improve quality of random data generation.
```
736b76f1

OF-998: Ant should resolve DTDs locally · d3f242e7

Guus der Kinderen authored Jan 05, 2016

Ant (or rather, the XMLTask in our build) attempts to lookup DTDs
online. The build (of plugins) will fail if no internet connectivity
is available. This commit references DTDs locally, allowing Ant to
skip the online lookup.

d3f242e7

OF-1000 Prevent NPE and improve logging · 1afdefef

Guus der Kinderen authored Jan 05, 2016

When a log directory cannot be created, a warning should be logged,
and null pointers should be prevented when the directory is being
referenced.

1afdefef

OF-999: Allow configuration of BOSH worker thread pool · 9bb61406

Guus der Kinderen authored Jan 05, 2016

The thread pool that performs processing of data received through the HTTP-based
connections of BOSH (as provided by Jetty) should not have a hardcoded upper bound.
Instead, the pool size should be configurable.

For other connection types, this is managed by properties named as such:
 - xmpp.client.processing.threads (client sockets)
 - xmpp.multiplex.processing.threads (connection managers)
 - xmpp.component.processing.threads (components)

BOSH does have a similar property: httpbind.client.processing.threads
It's value however is not used to configure the amount of worker threads. It is
used to configure the amount of (NIO) acceptors instead. In NIO, acceptor
threads handle network IO, and hand off processing to the worker threads.

There's little benefit in being able to configure the amount of acceptors, as
Jetty will default to a platform-specific default (based on the number of CPUs
that are available). There is greater benefit in being able to configure the
amount of worker threads (as that's more likely to affect throughput).

9bb61406

04 Jan, 2016 2 commits

OF-122: Use strict policy by default · 7ef6b4a7

Tom Evans authored Jan 04, 2016

Per PR feedback, default to a strict (conforming) policy when detecting
MUC room subject change requests.

Additional work could be done to add a corresponding configuration
option to the MUC service admin console, but is not included in the
scope of this PR.

7ef6b4a7

Use StreamIDFactory when generating Stream IDs · 579a8247

Guus der Kinderen authored Jan 04, 2016

StreamIDFactory is designed to generate stream IDs. It's silly to use
something else when generating stream IDs.

579a8247