1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Commit Graph

2043 Commits

Author SHA1 Message Date
Marvin Scholz
ca682bb4d7 Add .travis.yml for Travis CI 2017-11-11 23:50:49 +01:00
Philipp Schafft
fa86f2de73 Merge branch 'ph3-update-TLS' 2017-07-23 13:22:21 +00:00
Philipp Schafft
cd9c8420d3 Feature: Added new config tag tls-context, tls-key and attribute implementation 2017-07-23 13:14:48 +00:00
Philipp Schafft
ac92af50c5 Fix: Corrected typo 2017-07-23 13:14:48 +00:00
Philipp Schafft
b47ae369b6 Update: Prepare code for a new <tls-context> element 2017-07-23 13:14:48 +00:00
Philipp Schafft
68b3b1c72a Feature: Added function to check for specific TLS implementation 2017-07-23 13:14:48 +00:00
Philipp Schafft
9cbc110f78 Fix: Do not announce Upgrade to TLS on TLS Mode DISABLED sockets 2017-07-23 13:14:48 +00:00
Philipp Schafft
a864fbf47a Make tls mode more configureable 2017-07-23 13:14:48 +00:00
Philipp Schafft
d7cd12de75 Cleanup: Wording and object names from SSL to TLS 2017-07-23 13:14:48 +00:00
Philipp Schafft
e513f09b85 Typo: openSSL->OpenSSL 2017-07-23 13:14:48 +00:00
Philipp Schafft
3376498e5e Update: completly abstracted OpenSSL into tls.[ch] 2017-07-23 13:14:48 +00:00
Philipp Schafft
a1aa0196b2 Feature: Allow to use of non-TLS sockets for TLS clients 2017-07-23 13:14:48 +00:00
Philipp Schafft
1d39b657da Feature: Allow reloading TLS key on the fly 2017-07-23 13:14:48 +00:00
Philipp Schafft
a6eb48e44d Update: Abstracted TLS support in tls.c 2017-07-23 13:14:48 +00:00
Philipp Schafft
64b16f8296 Update: Abstracted the TLS context code into tls.c 2017-07-23 13:14:48 +00:00
Marvin Scholz
b7087c38e0 Fix manageauth test with missing id
404 is the expected result
2017-03-04 20:41:21 +01:00
Marvin Scholz
e15cd692e8 Add some automated tests 2017-03-04 19:08:02 +01:00
Philipp Schafft
33d3dd7c57 Merge branch 'feature-opus-tags' 2017-01-22 08:54:57 +00:00
Philipp Schafft
53e95727b4 Update: Code style 2017-01-22 08:52:57 +00:00
Philipp Schafft
89804764b0 Fix: Do not segfaul on bad Opus streams 2017-01-22 08:52:57 +00:00
Philipp Schafft
5b512da304 Cleanup: corrected debug output of Opus support 2017-01-22 08:52:56 +00:00
Philipp Schafft
0d7f81b75a Feature: Added support to extract metadata from Opus streams.
This adds support to read metadata from Ogg/Opus streams:
 * Original sample rate from OpusHead,
 * number of channels from OpusHead,
 * Tags from OpusTags.
2017-01-22 08:52:56 +00:00
Philipp Schafft
ed54d5eb84 Merge branch 'feature-logs' 2017-01-22 08:50:28 +00:00
Philipp Schafft
84124c313a Update: Added spaces to output of auth_result2str().
This adds spaces into the strings such as "nomatch" (-> "no match")
as returned by auth_result2str(). This is to improve readability of
resulting logfiles by most uses.
2017-01-22 08:38:01 +00:00
Philipp Schafft
e75b1a1612 Fix: Corrected number of arguments for ICECAST_LOG_INFO()
This fixes the number of arguments for ICECAST_LOG_INFO().
Why doesn't GCC warn about this?
2017-01-22 08:38:01 +00:00
Philipp Schafft
f5dd306f71 Update: improved auth related logging 2017-01-22 08:38:01 +00:00
Philipp Schafft
ce2b4195da Fix: Fixes a number of empty string segfaults in config parser
This fixes a number of segfault happening in case config tags are
empty. This patch also adds warnings for most cases.

Please test for any regressions.
This should likely be ported to 2.4.4 as well.

Closes: #2265
2016-11-30 11:22:36 +00:00
Thomas B. Ruecker
70265c466e Spelling fix, thanks to Ukikie 2016-11-23 20:36:53 +00:00
Philipp Schafft
b3b1dd12a1 Workaround: This avoids libspeex printing warnings on Opus streams.
libspeex reports warnings in case of oddnesses with the data to stderr.
However Icecast2 uses those functions in it's codec probeing process.
This way libspeex will write messages to a posibily reused random handle.

This is clearly a bug by package maintainers of libspeex.
See the source code of this change as well as libspeex's source code
as reference.
2016-10-29 11:42:52 +00:00
Philipp Schafft
72075d0d0d Fix: Fixed regression introduced by r19250.
This fixes the regression introduced by r19250 (461a537561).
The fix checks if the source client is actually known before printing it's IP-Address.

See also: #2016
2016-09-04 11:38:07 +00:00
Marvin Scholz
4117a2d2e2 Config: Rename mp3-metadata-interval to icy-metadata-interval
As proposed in #2272, this renames the mount specific
mp3-metadata-interval to icy-metadata-interval to prevent
confusion about what it does (setting the icy metadata
interval) and to make clear it's not mp3 specific but ICY
specific.
2016-06-28 11:39:57 +00:00
Marvin Scholz
4345060c02 Cleanup: corrected usage of spaces 2016-06-07 11:30:46 +00:00
Marvin Scholz
18613e96f5 Fix: corrected linking of CURL support.
This corrects the test for libcurl.

Closes: #2273
2016-06-07 11:27:32 +00:00
Philipp Schafft
834de5ba77 Fix: allow building without libcurl support 2016-04-19 15:13:12 +00:00
Marvin Scholz
43658deb37 Add log message for succesful streamlist requests 2016-04-13 10:12:39 +02:00
JRS
a552c6e667 Fix update_from_master() for receiving HTTP/1.1
Signed-off-by: Marvin Scholz <epirat07@gmail.com>
2016-04-13 09:57:00 +02:00
Philipp Schafft
6e2773a43d Merged update for file extension check
Closes: #2248
2016-03-27 18:09:53 +00:00
Philipp Schafft
c8f565b030 Update: SECURITY File extension check for trailing characters
This changes the file extension check in a way that it no longer
ignores trailing characters. This significantly reduces the risk
for false positives while matching. However this invalidates old
setups with files like foo.xsl3. However I have never files like
that in the wild.

This is based on the patch privided by ePirat in ticket #2248.

See: #2248
2016-03-27 17:51:59 +00:00
Philipp Schafft
805084ccd1 Merge branch 'webm-stuff' 2016-03-27 17:23:46 +00:00
Joseph Wallace
a2cac3ee93 Make ebml_parse_tag return tag ID code
(applying lessons learned from libshout)
2016-03-27 12:29:23 -04:00
Joseph Wallace
a218055158 Move tag-parsing bail conditions to top for clarity. 2016-03-27 12:29:23 -04:00
Joseph Wallace
78293f0485 Delete some debugging comments. 2016-03-27 12:29:06 -04:00
Joseph Wallace
dcbba0c600 Cleanup some signed-type issues in format-ebml.c 2016-03-27 12:29:06 -04:00
Philipp Schafft
9cae2ef646 Updated submodules 2016-03-27 13:16:23 +00:00
Joseph Wallace
788bd94eeb BUGFIX: Use a signed type for capturing the return value of client_read_bytes()
Signed-off-by: Marvin Scholz <epirat07@gmail.com>
2016-02-13 21:12:34 +01:00
Marvin Scholz
3a73f9c146 More hardening of XML output against invalid entities
This replaces the add node function with the one intended for text nodes
to prevent that invalid entities are not encoded and therefore could
break the XML output.

(See d739c65e54 and #2255)
2016-02-10 20:56:56 +01:00
Thomas B. Ruecker
4c57532e7b Added missing space to fix output 2016-02-10 08:15:48 +00:00
Marvin Scholz
37150fe020 Fix STATS legacy authentication
This fixes the issue that auth for STATS method always fails, by
adding stats method to legacy admin auth in cfgfile.c
2016-02-09 20:27:10 +01:00
Marvin Scholz
d739c65e54 Fix invalid entities in listclient xml
This fixes a bug where listener Referer or User-Agent strings containing
a sequence like `&T;` was not escaped properly and therefore made the
whole XML document invalid.
Injecting new XML nodes (<foo></foo>) was not possible, it seems in the
worse case all it could cause was that the XML failed to parse.

Fix #2255
2016-02-08 23:02:02 +01:00
Philipp Schafft
235527192c Merge branch 'webmKeyFrames' 2016-02-06 17:44:56 +00:00