summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Glenn Maynard [Thu, 28 Apr 2011 04:53:59 +0000 (00:53 -0400)]
Report the original stream:error stanza to clients.
When a stream:error was received, the error was parsed, converted to a
StreamError exception, then XML was recreated from that. This is roundabout
and lossy: it's parsing the XML, then attempting to recreate the same XML
that it already had.
Instead, keep the original XML node in the exception, and use it directly.
This ensures that the <stream:error> node in remote-stream-error is
unchanged from what we received from the remote server. Any extensions
will be passed through unchanged, as should happen for all stanzas.
For example, the <stream:error> node reported by Jabber14 now correctly
reproduces its xmlns='jabber:client' attribute.
The simple patch in patches.py should eventually be sent upstream.
Christopher Zorn [Mon, 28 Mar 2011 15:04:25 +0000 (08:04 -0700)]
Merge branch 'black_list_3'
Jack Moffitt [Sat, 26 Mar 2011 20:50:46 +0000 (14:50 -0600)]
Add black list support to punjab.
Christopher tofu Zorn [Mon, 15 Nov 2010 22:00:35 +0000 (17:00 -0500)]
add prefix support for raw strings that works
Christopher tofu Zorn [Mon, 20 Sep 2010 19:50:05 +0000 (15:50 -0400)]
add a cleaner way to run different tests, also some small formatting changes
Christopher tofu Zorn [Mon, 16 Aug 2010 20:47:05 +0000 (16:47 -0400)]
remove debugging
Garret Heaton [Tue, 10 Aug 2010 20:15:48 +0000 (13:15 -0700)]
Merge branch 'escape-xml-attributes'
Garret Heaton [Tue, 10 Aug 2010 20:00:53 +0000 (13:00 -0700)]
Properly escape XML attributes for raw XML capture
Without this fix, the raw XML will not match the original XML in the
case where XML entities are present. This can result in the sending of
invalid XML to the XMPP server.
Garret Heaton [Sat, 7 Aug 2010 20:11:48 +0000 (13:11 -0700)]
Terminate active BOSH sessions when stopping.
Fixes issue #29.
Christopher tofu Zorn [Tue, 27 Apr 2010 20:23:25 +0000 (16:23 -0400)]
typo in year
Christopher tofu Zorn [Tue, 27 Apr 2010 20:22:23 +0000 (16:22 -0400)]
bump copyright and add powdahound to contributors
Christopher tofu Zorn [Tue, 27 Apr 2010 20:16:03 +0000 (16:16 -0400)]
add tests for whitelist and a small bug fix on matches, also add support for *
Garret Heaton [Tue, 27 Apr 2010 18:58:06 +0000 (11:58 -0700)]
Subdomain support for white_list.
Garret Heaton [Tue, 27 Apr 2010 18:57:41 +0000 (11:57 -0700)]
Take white_list as command line arg.
Garret Heaton [Tue, 27 Apr 2010 17:36:50 +0000 (10:36 -0700)]
Fix namespaces used when returning stream errors.
Previously, <stream:error> stanzas coming from the XMPP server would be
sent to connected clients with mangled namespaces, like so:
<body xmlns='http://jabber.org/protocol/httpbind' type='terminate'
condition='remote-stream-error'>
<ns0:error xmlns:ns0='http://etherx.jabber.org/streams'>
<system-shutdown xmlns='urn:ietf:params:xml:ns:xmpp-streams'/>
</ns0:error>
</body>
Now they will have correct prefixes:
<body xmlns='http://jabber.org/protocol/httpbind' type='terminate'
condition='remote-stream-error'>
<stream:error xmlns:stream='http://etherx.jabber.org/streams'>
<system-shutdown xmlns='urn:ietf:params:xml:ns:xmpp-streams'/>
</stream:error>
</body>
Christopher tofu Zorn [Thu, 11 Feb 2010 18:52:25 +0000 (13:52 -0500)]
report ssl error when its not available
Christopher tofu Zorn [Mon, 8 Feb 2010 16:19:51 +0000 (11:19 -0500)]
add white list docs to tac file
Christopher tofu Zorn [Mon, 8 Feb 2010 14:25:58 +0000 (09:25 -0500)]
add twisted names to required dependency
Christopher tofu Zorn [Mon, 8 Feb 2010 14:07:29 +0000 (09:07 -0500)]
allow limiting servers with a white list
Christopher tofu Zorn [Mon, 8 Feb 2010 10:56:46 +0000 (05:56 -0500)]
bump up version to 0.14
Christopher tofu Zorn [Mon, 8 Feb 2010 10:54:37 +0000 (05:54 -0500)]
change bosh resource path to http-bind like prosody and ejabberd
Christopher tofu Zorn [Mon, 8 Feb 2010 10:45:17 +0000 (05:45 -0500)]
make sure we always use xmpp-httpbind as the resource
Christopher tofu Zorn [Mon, 8 Feb 2010 09:54:52 +0000 (04:54 -0500)]
add ability to create sessions for other protocols, split xep-124 and xep-206
Christopher tofu Zorn [Wed, 20 Jan 2010 15:17:55 +0000 (10:17 -0500)]
Merge branch 'flash-crossdomain-27'
Christopher tofu Zorn [Wed, 20 Jan 2010 15:15:34 +0000 (10:15 -0500)]
Merge branch 'cors-26'
Jack Moffitt [Wed, 20 Jan 2010 06:48:08 +0000 (23:48 -0700)]
Add crossdomain.xml to static dir to support cross-domain requests from flash.
Jack Moffitt [Wed, 20 Jan 2010 06:45:55 +0000 (23:45 -0700)]
Added support for W3C CORS, to allow cross-domain http bind requests from browsers.
Christopher 'Tofu' Zorn [Thu, 1 Oct 2009 20:44:11 +0000 (16:44 -0400)]
add some debugging and remove unused code
Christopher 'Tofu' Zorn [Fri, 18 Sep 2009 18:37:15 +0000 (14:37 -0400)]
log the raw string
Christopher 'Tofu' Zorn [Fri, 27 Feb 2009 02:31:48 +0000 (21:31 -0500)]
Merge branch 'verbose_logging_fix'
Christopher 'Tofu' Zorn [Fri, 27 Feb 2009 02:31:20 +0000 (21:31 -0500)]
fix it so verbose is verbose and only err logs if not verbose
Christopher 'Tofu' Zorn [Mon, 9 Feb 2009 15:57:07 +0000 (10:57 -0500)]
small change to test git
Jack Moffitt [Sat, 17 Jan 2009 02:25:53 +0000 (19:25 -0700)]
Silenced underlying twisted logging via self.noisy.
Jack Moffitt [Sat, 17 Jan 2009 00:06:25 +0000 (17:06 -0700)]
Removed spurious logging.
Jack Moffitt [Fri, 16 Jan 2009 23:48:24 +0000 (16:48 -0700)]
Added .gitignore.
Jack Moffitt [Fri, 16 Jan 2009 23:47:22 +0000 (16:47 -0700)]
Fixed logging to respect the verbosity setting.
Christopher 'Tofu' Zorn [Mon, 5 Jan 2009 13:50:23 +0000 (08:50 -0500)]
add ability to bind to ips. re: #12
Christopher 'Tofu' Zorn [Sun, 4 Jan 2009 23:14:52 +0000 (18:14 -0500)]
fix code for old bug in older twisteds, plus connect differently if we are using localhost
Christopher 'Tofu' Zorn [Sun, 4 Jan 2009 23:01:53 +0000 (18:01 -0500)]
fix code for old bug in older twisteds, plus connect differently if we are using localhost
Christopher Zorn [Wed, 3 Dec 2008 21:23:27 +0000 (21:23 +0000)]
add patch from groups.google.com/group/punjab-xmpp/browse_thread/thread/
8877b2b686ff998c?hl=en re #12
Christopher Zorn [Wed, 3 Dec 2008 21:17:28 +0000 (21:17 +0000)]
Branching to add the ability to bind a client to a socket. re #12
Christopher Zorn [Fri, 7 Nov 2008 00:50:47 +0000 (00:50 +0000)]
a test
Christopher Zorn [Thu, 6 Nov 2008 22:44:32 +0000 (22:44 +0000)]
change text for a test
Christopher Zorn [Thu, 6 Nov 2008 22:25:18 +0000 (22:25 +0000)]
commit test
Christopher Zorn [Thu, 6 Nov 2008 22:14:58 +0000 (22:14 +0000)]
commit test
Christopher Zorn [Thu, 6 Nov 2008 22:09:50 +0000 (22:09 +0000)]
commit test
Christopher Zorn [Fri, 19 Sep 2008 18:23:40 +0000 (18:23 +0000)]
add tests to distro
Nathan Zorn [Fri, 19 Sep 2008 18:15:04 +0000 (18:15 +0000)]
fix for punjab tests from anywhere
Nathan Zorn [Fri, 19 Sep 2008 18:06:23 +0000 (18:06 +0000)]
merge in url changes and version update from source:/branches/version-0.13-10
Christopher Zorn [Fri, 19 Sep 2008 16:00:12 +0000 (16:00 +0000)]
moving stuff around
Christopher Zorn [Fri, 19 Sep 2008 15:59:28 +0000 (15:59 +0000)]
moving stuff around
Christopher Zorn [Fri, 19 Sep 2008 15:59:28 +0000 (15:59 +0000)]
moving stuff around
Jack Moffitt [Fri, 19 Sep 2008 15:53:30 +0000 (15:53 +0000)]
Removed merge tracking for "svnmerge" for
https://code.stanziq.com/svn/punjab/branches/timeout-test-5
Jack Moffitt [Fri, 19 Sep 2008 15:52:58 +0000 (15:52 +0000)]
Merged revisions 9,17-20 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/timeout-test-5
........
r9 | tofu | 2008-09-18 07:48:00 -0600 (Thu, 18 Sep 2008) | 1 line
test is not complete, just saving
........
r17 | tofu | 2008-09-18 15:26:16 -0600 (Thu, 18 Sep 2008) | 1 line
fix inactivity and add a timeout test
........
r18 | tofu | 2008-09-18 16:54:57 -0600 (Thu, 18 Sep 2008) | 1 line
test for terminate too
........
r19 | tofu | 2008-09-19 08:05:55 -0600 (Fri, 19 Sep 2008) | 1 line
alter the tests a bit
........
r20 | tofu | 2008-09-19 08:44:19 -0600 (Fri, 19 Sep 2008) | 1 line
dont use jabber
........
Jack Moffitt [Fri, 19 Sep 2008 15:52:58 +0000 (15:52 +0000)]
Merged revisions 9,17-20 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/timeout-test-5
........
r9 | tofu | 2008-09-18 07:48:00 -0600 (Thu, 18 Sep 2008) | 1 line
test is not complete, just saving
........
r17 | tofu | 2008-09-18 15:26:16 -0600 (Thu, 18 Sep 2008) | 1 line
fix inactivity and add a timeout test
........
r18 | tofu | 2008-09-18 16:54:57 -0600 (Thu, 18 Sep 2008) | 1 line
test for terminate too
........
r19 | tofu | 2008-09-19 08:05:55 -0600 (Fri, 19 Sep 2008) | 1 line
alter the tests a bit
........
r20 | tofu | 2008-09-19 08:44:19 -0600 (Fri, 19 Sep 2008) | 1 line
dont use jabber
........
Jack Moffitt [Fri, 19 Sep 2008 15:50:21 +0000 (15:50 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-8" from
https://code.stanziq.com/svn/punjab/branches/timeout-test-5
Jack Moffitt [Thu, 18 Sep 2008 15:45:39 +0000 (15:45 +0000)]
Removed merge tracking for "svnmerge" for
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6
Jack Moffitt [Thu, 18 Sep 2008 15:45:12 +0000 (15:45 +0000)]
Merged revisions 4-7,10-13 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6
........
r4 | tofu | 2008-09-17 13:55:35 -0600 (Wed, 17 Sep 2008) | 1 line
make methods and clean up code
........
r5 | tofu | 2008-09-17 14:29:48 -0600 (Wed, 17 Sep 2008) | 1 line
change appending waiting_requests and fix a typo
........
r6 | tofu | 2008-09-17 14:36:55 -0600 (Wed, 17 Sep 2008) | 1 line
more fixes
........
r7 | tofu | 2008-09-17 14:51:04 -0600 (Wed, 17 Sep 2008) | 1 line
fix typo
........
r10 | tofu | 2008-09-18 07:56:26 -0600 (Thu, 18 Sep 2008) | 1 line
no need for if statement and change the way we handle too many holds
........
r11 | tofu | 2008-09-18 08:05:07 -0600 (Thu, 18 Sep 2008) | 1 line
just use _wrPop when we need to return blanks
........
r12 | tofu | 2008-09-18 08:15:16 -0600 (Thu, 18 Sep 2008) | 1 line
make a clearWaitingRequests method and do some more clean up
........
r13 | tofu | 2008-09-18 08:41:30 -0600 (Thu, 18 Sep 2008) | 1 line
add a comment
........
Jack Moffitt [Thu, 18 Sep 2008 15:45:12 +0000 (15:45 +0000)]
Merged revisions 4-7,10-13 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6
........
r4 | tofu | 2008-09-17 13:55:35 -0600 (Wed, 17 Sep 2008) | 1 line
make methods and clean up code
........
r5 | tofu | 2008-09-17 14:29:48 -0600 (Wed, 17 Sep 2008) | 1 line
change appending waiting_requests and fix a typo
........
r6 | tofu | 2008-09-17 14:36:55 -0600 (Wed, 17 Sep 2008) | 1 line
more fixes
........
r7 | tofu | 2008-09-17 14:51:04 -0600 (Wed, 17 Sep 2008) | 1 line
fix typo
........
r10 | tofu | 2008-09-18 07:56:26 -0600 (Thu, 18 Sep 2008) | 1 line
no need for if statement and change the way we handle too many holds
........
r11 | tofu | 2008-09-18 08:05:07 -0600 (Thu, 18 Sep 2008) | 1 line
just use _wrPop when we need to return blanks
........
r12 | tofu | 2008-09-18 08:15:16 -0600 (Thu, 18 Sep 2008) | 1 line
make a clearWaitingRequests method and do some more clean up
........
r13 | tofu | 2008-09-18 08:41:30 -0600 (Thu, 18 Sep 2008) | 1 line
add a comment
........
Jack Moffitt [Thu, 18 Sep 2008 15:43:12 +0000 (15:43 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-3" from
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6
Christopher Zorn [Tue, 16 Sep 2008 18:46:36 +0000 (18:46 +0000)]
importing punjab, no need for history
Christopher Zorn [Tue, 16 Sep 2008 18:46:36 +0000 (18:46 +0000)]
importing punjab, no need for history