Commit Graph

31506 Commits

Author SHA1 Message Date
Sean Bright
339bf0cf7b AST-2018-009: Fix crash processing websocket HTTP Upgrade requests
The HTTP request processing in res_http_websocket allocates additional
space on the stack for various headers received during an Upgrade request.
An attacker could send a specially crafted request that causes this code
to overflow the stack, resulting in a crash.

* No longer allocate memory from the stack in a loop to parse the header
values.  NOTE: There is a slight API change when using the passed in
strings as is.  We now require the passed in strings to no longer have
leading or trailing whitespace.  This isn't a problem as the only callers
have already done this before passing the strings to the affected
function.

ASTERISK-28013 #close

Change-Id: Ia564825a8a95e085fd17e658cb777fe1afa8091a
2018-09-20 11:18:57 -05:00
Joshua Colp
84b60aeb70 Merge "stasis_cache: Stop caching stasis subscription change messages" into 16 2018-09-20 09:20:56 -05:00
Joshua Colp
36898351e5 Merge "pjproject: Update initial 2.8 patches to apply cleanly." into 16 2018-09-20 06:24:59 -05:00
Joshua Colp
e313ec3a7e Merge "alembic: fix suppress_q850_reason_headers column name" into 16 2018-09-20 04:53:58 -05:00
Joshua Colp
3c1a8be11e Merge "app_voicemail: Remove need to subscribe to stasis" into 16 2018-09-20 04:53:43 -05:00
Richard Mudgett
c008c27c85 pjproject: Update initial 2.8 patches to apply cleanly.
ASTERISK-28059

Change-Id: I027472f2753391646dde594a709a75f14422db93
2018-09-19 10:30:06 -05:00
Joshua Colp
7912ad9bf7 Merge "res_pjsip_session: Don't add declined stream if one does not exist." into 16 2018-09-19 08:42:16 -05:00
George Joseph
40082f3e00 Merge "pjproject: Upgrade to 2.8." into 16 2018-09-19 08:06:21 -05:00
Richard Mudgett
192f71b7de stasis_message.c: Don't create immutable stasis objects with locks.
* Create the stasis message object without a lock as it is immutable.
* Create the stasis message type object without a lock as it is immutable.
* Creating the stasis message type could crash if the passed in type name
is NULL and REF_DEBUG is enabled.  Added missing NULL check when passing
the ao2 object tag string.

Change-Id: I28763c58bb9f0b427c11971d0103bf94055e7b32
2018-09-18 13:18:08 -05:00
Joshua Colp
60258b4ec1 pjproject: Upgrade to 2.8.
This change brings in PJSIP 2.8, removes all the patches
that were merged upstream, and makes a minor change to
support a breaking change that was done.

ASTERISK-28059

Change-Id: I5097772b11b0f95c3c1f52df6400158666f0a189
2018-09-18 11:32:11 -05:00
Florian Floimair
3e48c34f14 alembic: fix suppress_q850_reason_headers column name
In the original commit introducing the feature the column in the alembic
script was called 'suppress_q850_reason_header'.
In the code however the option is called 'suppress_q850_reason_headers'
(trailing 's'). This leads to errors when ARI push configuration is used.

Change-Id: Ie84808adbca6fcc9136556e4f5d741adbef5d14f
2018-09-18 09:46:03 -05:00
George Joseph
29115e2384 app_voicemail: Remove need to subscribe to stasis
app_voicemail was using the stasis cache to build and maintain a
list of mailboxes that had subscribers.  It then used this list
to determine if a mailbox should be polled for new messages if
polling was enabled.  For this to work, stasis had to cache every
subscription and unsubscription to the mailbox which caused a lot of
overhead, both cpu and memory related.

Since polling is only required when changes are being made to
mailboxes outside of app_voicemail and since the number of mailboxes
that don't have any subscribers is likely to be very low, all
mailboxes are now polled instead of just the ones with subscribers.

This paves the way for disabling the caching of stasis subscription
change messages.

Also fixed cleanup in some of the unit tests that not only left
test users in the users list but also caused segfaults if the tests
were run more than once.

ASTERISK-27121

Change-Id: I5cceb737246949f9782955c64425b8bd25a9e9ee
2018-09-18 07:44:00 -06:00
Joshua Colp
6e79e6b097 res_pjsip_session: Don't add declined stream if one does not exist.
Given a scenario where a session refresh was done with a removed
stream we would always add a removed stream to the outgoing SDP
even if one did not already exist.

This change makes it so that a removed stream is only placed into
the SDP if one already exists.

ASTERISK-28047

Change-Id: Ibb97d21cdeb87a8acae0c720861b0ff255708442
2018-09-18 06:10:59 -05:00
Sean Bright
b0a0b975c5 autoconf: Check for srtp_get_version_string() before using it
Change-Id: Id2a916ff9448706090e72ff2c7fb3f5ba24a05df
2018-09-17 10:47:56 -05:00
George Joseph
0107e1aa5a Merge "res_srtp.c: Show linked version of libsrtp on module init" into 16 2018-09-17 09:24:31 -05:00
Jenkins2
4300410c9a Merge "res_pjsip: Log IPv6 addresses correctly" into 16 2018-09-17 08:11:34 -05:00
George Joseph
4a309839eb CI: Fix typo in testsuite git checkout
Change-Id: I30024515e5b00a5044fd39fbff27d818f016b719
2018-09-17 07:15:01 -05:00
Sean Bright
55ca51af21 res_srtp.c: Show linked version of libsrtp on module init
Change-Id: Ib0a645d6985de5757cc4399ed2524b2d02c4f342
2018-09-16 06:11:47 -05:00
Sean Bright
887a315e17 res_pjsip: Log IPv6 addresses correctly
Both pjsip_tx_data.tp_info.dst_name and pjsip_rx_data.pkt_info.src_name
store IPv6 addresses without enclosing brackets. This causes some log
output to be confusing because it is difficult to separate the IPv6
address from a port specification.

* Use pj_sockaddr_print() along with pjsip_tx_data.tp_info.dst_addr and
  pjsip_rx_data.pkt_info.src_addr where possible for consistent IPv6
  output.

* When a pj_sockaddr is not available, explicitly wrap IPv6 addresses
  in brackets.

* When assigning pjsip_rx_data.pkt_info.src_name ourselves, make sure
  to also set pjsip_rx_data.pkt_info.src_addr.

Change-Id: I5cfe997ced7883862a12b9c7d8551d76ae02fcf8
2018-09-14 14:59:19 -05:00
George Joseph
3f9544c1f5 CI: Use proper credentials for Security testsuite checkout
Can't do anonymous http checkout from Security-testsuite.
Need to use same credentials as the gerrit review checkout.

Change-Id: I87af68c995cb8926f5e87f9af245600d76984f05
2018-09-14 12:34:50 -05:00
George Joseph
349355f1f1 Merge "res_musiconhold.c: Restart MOH if previous hold just reached end-of-file" into 16 2018-09-14 11:12:40 -05:00
George Joseph
17d6d9e1e7 stasis_cache: Stop caching stasis subscription change messages
Since app_voicemail no longer uses the cache to maintain its state
there is no longer a need to cache these messages.

ASTERISK-27121

Change-Id: I321c708505f5ad8d00e1b0afc4c27dc2ac12ecb4
2018-09-14 06:04:50 -05:00
George Joseph
06d51a0408 Merge "optional_api: Remove unused nonoptreq fields" into 16 2018-09-13 13:09:17 -05:00
George Joseph
9db82309d5 Merge "CI: Use .gitreview to default BRANCH_NAME." into 16 2018-09-13 10:37:07 -05:00
Jenkins2
39829f0a78 Merge "res_pjproject: Fix sockaddr conversion routines for non-bundled PJSIP" into 16 2018-09-13 07:09:34 -05:00
Corey Farrell
5842741689 CI: Use .gitreview to default BRANCH_NAME.
This ensures that binary modules are avoided in the master branch even
if BRANCH_NAME is not set.

Change-Id: I79162d2063f22fa9d6b31fde4827ace2dd5bf0da
2018-09-12 19:11:57 -05:00
Walter Doekes
78453e65fd optional_api: Remove unused nonoptreq fields
As they're not actively used, they only grow stale. The moduleinfo field itself
is kept in Asterisk 13/15 for ABI compatibility.

ASTERISK-28046 #close

Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc
2018-09-12 19:33:08 +02:00
Joshua Colp
7ed02b4925 Merge "manager: Set AMI event "Newexten" to the EVENT_FLAG_DIALPLAN class" into 16 2018-09-12 11:01:14 -05:00
lvl
f4bffe2326 manager: Set AMI event "Newexten" to the EVENT_FLAG_DIALPLAN class
The documentation already specified EVENT_FLAG_DIALPLAN for this
event, but the implementation was using EVENT_FLAG_CALL.

Using EVENT_FLAG_DIALPLAN allows AMI clients to opt out of receiving
this highly verbose event.

ASTERISK-28033

Change-Id: I45b3119f30e4dbc17b49831f2b1a4f2c1beadafe
2018-09-12 09:20:50 -05:00
Sean Bright
e5739c494c res_pjproject: Fix sockaddr conversion routines for non-bundled PJSIP
The bundled version of pjproject has a patch for Solaris compatability
that changes the definition of various socket structures which we need
to account for when compiling against a non-bundled version.

ASTERISK-28049 #close

Change-Id: Ia1ea47c433fc2d915115193ee889a752373925f0
2018-09-12 07:26:23 -05:00
Corey Farrell
ecb3b23b07 Build System: Resolve conflict between DESTDIR and bundled jansson.
If Asterisk is built using a DESTDIR this will cause the bundled jansson
to be installed to an unexpected location and we will fail to find it.

Change-Id: Id033e2813261e0d45232383d44c6391122169548
2018-09-10 22:36:25 -05:00
Frederic LE FOLL
ccfd2e0f5d res_musiconhold.c: Restart MOH if previous hold just reached end-of-file
On MOH activation, moh_files_readframe() is called while the current
stream attached to the channel is NULL and it calls ast_moh_files_next()
immediately.  However, it won't call ast_moh_files_next() again if sample
reading fails.  The failure may occur because res_musiconhold retains the
last sample reading position in the channel data and MOH during the
previous hold/retrieve just reached EOF.  Obviously, a bit of bad luck is
required here.

* Restructured moh_files_readframe() to try a second time to start MOH if
there was no stream setup and the saved position was at EOF.  Also added
comments describing what is going on for each step.

ASTERISK-28029

Change-Id: I1508cf2c094f8feca22d6f76deaa9fdfa9944860
2018-09-07 07:58:35 -05:00
Jenkins2
c1a2c84361 Merge "core: Don't stop generators when writing RTCP frames." into 16 2018-09-07 07:02:24 -05:00
Joshua Colp
3c52cc32f1 Merge "stasis_cache: Prune stasis_subscription_change messages" into 16 2018-09-07 05:40:17 -05:00
Joshua Colp
6344cceed2 Merge "app_queue: Update realtime queuemembers after wait_a_bit(), not before" into 16 2018-09-07 04:48:40 -05:00
Joshua Colp
af6a3d02e1 core: Don't stop generators when writing RTCP frames.
Generators provide such functionality as tone generation or
silence generation. RTCP frames provide RTCP information and
should not stop generators from operating.

ASTERISK-28005

Change-Id: Ieadada07b068a7aa426e8763f1b73a18e1ac34a9
2018-09-06 17:08:48 -05:00
lvl
034a3d8b86 app_queue: Update realtime queuemembers after wait_a_bit(), not before
This ensures the most up-to-date information is used for the next
call attempt.

ASTERISK-28032

Change-Id: I02fc17c6ffb50bb60ea97c2d2e6023e8061815ce
2018-09-06 16:13:44 -05:00
Sean Bright
3134fd95a9 res_pjproject: Add utility functions to convert between socket structures
Currently, to convert from a pj_sockaddr to an ast_sockaddr, the address
needs to be rendered to a string and then parsed into the correct
structure. This also involves a call to getaddrinfo(3). The same is true
for the inverse operation.

Instead, because we know the internal structure of both ast_sockaddr and
pj_sockaddr, we can translate directly between the two without the
need for an intermediate string.

Change-Id: If0fc4bba9643f755604c6ffbb0d7cc46020bc761
2018-09-06 14:29:44 -04:00
George Joseph
ead0bc63da Merge "http.c: Give HTTP error response when received lines are too long." into 16 2018-09-06 11:50:30 -05:00
George Joseph
9fb166cf3b stasis_cache: Prune stasis_subscription_change messages
The stasis cache provides a way to reconstruct the current state
of topic subscribers.  Unfortunately, since every subscribe and
unsubscribe is cached, the cache continues to grow unabated while
asterisk is running.  This patch removes subscribe messages from
the cache when the corresponding unsubscribe is received.

This patch also registers the cache containers with ao2 so that if
AO2_DEBUG is turned on, you can list the container and get its
stats from the CLI.

ASTERISK-27121

Change-Id: I3d18905e477f3721815da91f30da8d3fbb2d4f56
2018-09-05 13:52:08 -05:00
George Joseph
85a7c33acf Merge "app_dial: set the comment for OPT_ARG_ANNOUNCE to really what is done" into 16 2018-09-05 11:00:52 -05:00
George Joseph
597f612645 Merge "res_pjsip: Fix mwi_subscribe_replaces_unsolicited type mismatch" into 16 2018-09-05 09:55:55 -05:00
George Joseph
10460501ca Merge "iostream.c: Fix ast_iostream_gets() needlessly returning failure." into 16 2018-09-05 09:53:29 -05:00
Rodrigo Ramírez Norambuena
8879a62c1c app_dial: set the comment for OPT_ARG_ANNOUNCE to really what is done
Change-Id: I08f88adb09f7e5813f37e70fecd787468cdb32c8
2018-09-04 07:51:58 -05:00
Chris-Savinovich
cfb854e241 pbx_config.c: Fix reloading module if initially declined to load
Added decline if extensions.conf file not available
when loading pbx_config, and also made sure everything
gets properly unregistered and/or destroyed on unload.

Change-Id: Ib00665106043b1be5148ffa7a477396038915854
2018-08-31 17:04:11 -05:00
Joshua Colp
ed7cef7d06 Merge "make config: os-release output error." into 16 2018-08-31 04:55:10 -05:00
Richard Mudgett
4fcdcfaa37 http.c: Give HTTP error response when received lines are too long.
Added a check when we receive a HTTP request line or header line that is
too long.  We now return an error response to the sender because we are
not able to process the request.

Change-Id: I6df2705435fd7dde4d5d3bdf7acec859cfb7c12d
2018-08-30 17:22:32 -05:00
Richard Mudgett
f6a165208b iostream.c: Fix ast_iostream_gets() needlessly returning failure.
Providing a buffer larger than the internal buffer of ast_iostream_gets()
fails to get lines longer than the internal buffer.

* Made ast_iostream_gets() fill the supplied buffer with read data until
either a '\n' is found or the supplied buffer is filled just like fgets().

Change-Id: If18b3f6ee500e22f0633a68779ed09f7e0f305ed
2018-08-30 17:12:00 -05:00
Joshua Colp
62afa54977 Merge "res_fax: Handle fax gateway being started more than once." into 16 2018-08-30 05:43:46 -05:00
Joshua Colp
ad37ab9a8f Merge "res_pjsip_transport_websocket: Properly set src_name for IPv6" into 16 2018-08-30 05:08:56 -05:00