Commit Graph

60 Commits

Author SHA1 Message Date
Tim Cooper
97741f645e grpc: move grpc-specific ini options to separate file 2016-05-08 16:45:52 +02:00
Tim Cooper
49a6d35f2b grpc: rename grpcCert, grpcKey to grpccert, grpckey 2016-05-08 16:45:52 +02:00
Tim Cooper
19537ac218 grpc: allow connections to be secured using TLS 2016-05-08 16:45:52 +02:00
Tim Cooper
cccbec3012 grpc: fix several TODO items 2016-05-08 16:45:52 +02:00
Tim Cooper
776c084a1a grpc: start implementation 2016-05-08 16:45:52 +02:00
Tim Cooper
6a3f2ef9e9 add note about allowping to murmur.ini regarding information exposure
fixes #1814
2016-04-30 17:09:20 +02:00
Mikkel Krautz
d793aa11d1 murmur.ini: document empty welcometext behavior.
Clients do not show welcome text's that are empty.
2015-11-30 23:16:04 +01:00
Mikkel Krautz
8bd3f76a8e Murmur: add support for EDH cipher suites, and for specifying Diffie-Hellman parmeters.
This change allows server admins to specify Diffie-Hellman
parameters for Murmur to use. This is done using the sslDHParams
option in the config file. Diffie-Hellman parameters can also be
set on a per-server basis using the sslDHParams option.

Note: the functionality implemented in this change requires the
QSslDiffieHellmanParameters class in Qt, which has not yet landed
upstream in the Qt 5 'dev' branch. This means that the functionality
discussed in this change will, for now, only work in binaries provided
by the Mumble project, or binaries that are built using our build
environments, and not binaries that link against any released versions
of Qt at present.

This change modifies the default TLS cipher suite string to add
EDH+aRSA+AESGCM, DHE-RSA-AES256-SHA and DHE-RSA-AES128-SHA.

This yields the following ciphers, in TLS/RFC notation:

    TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
    TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
    TLS_DHE_RSA_WITH_AES_256_CBC_SHA
    TLS_DHE_RSA_WITH_AES_128_CBC_SHA

This change also allows Murmur servers to provide forward secrecy
to older clients, such as our own pre-built binaries before 1.2.9.

It also provides forward secrecy for users that use Mumble 1.2.x
versions on Linux distros, and other Unix-like systems. This is
because Mumble 1.2.x on Unix-like systems builds against Qt 4, which
limits the connection to TLS 1.0.

Before this change, Murmur was not able to negotiate an ephemeral
Diffie-Hellman key exchange for those clients. This is now possible.
2015-09-26 22:33:49 +02:00
Samuel D. Leslie
83da4f1757 Replace all murmur.ini comments using hash (#) w/ semicolons (;)
Lines starting with a hash are not considered to be comments!!

The QSettings() class has no formal support for comments. In fact,
there's no mention of comments at all in the class documentation:
http://doc.qt.io/qt-5/qsettings.html

There is some limited support for comments by denoting a line with a
semicolon. You can confirm this via the associated source code:
https://github.com/qtproject/qtbase/blob/5.6/src/corelib/io/qsettings.cpp

However, if saving the file via the Qt interfaces, comments will
generally be stripped out. This isn't to my knowledge a problem for
Murmur as there's no case where the server itself will update its
configuration and save the changes back to its INI file automatically.

The existing sample INI file prior to this commit only ever worked as
there's an even number of unescaped special characters in the header!
2015-09-22 23:52:48 +02:00
asmolero
d110e56407 Fix grammar in default murmur.ini file 2015-08-19 01:17:17 +02:00
Phil
0623c14ff6 changed sourceforge links to mumble.info links 2015-07-05 10:43:56 +02:00
Mikkel Krautz
a3f93f7801 Murmur: add 'sslCiphers' option to allow server admins full control of Murmur's advertised TLS cipher suites.
This commit adds the 'sslCiphers' option to Murmur.

The 'sslCiphers' option is used to configure the list of advertised
TLS cipher suites. The option lives on Meta, so it is a server-wide
configuration, and cannot be configured on a per-virtual-server basis.

The 'sslCiphers' option uses the OpenSSL's cipher list format to
describe the cipher suite selection. For more information on this
format, see:

https://www.openssl.org/docs/apps/ciahers.html#CIPHER-LIST-FORMAT
2015-05-22 18:24:26 +02:00
Stefan Hacker
8aa125fbc7 Fix issues found in review of PR #1422 2014-10-21 02:33:05 +02:00
Stefan Hacker
5131d9e303 Review and refactor of PBKDF2 support patch.
* Adjusted to coding guidelines
* Pulled out PBKDF2 functionality into own class
* Make benchmark a best of N approach with guaranteed minimum
* Fixed broken database migration code. Don't try to alter
  tables and instead rely on them being re-created with the
  new fields.
* Fixed some typos in ini. Also move to the setting to the
  end so ppl. don't get the idea they have to change this.
* Chose a scarier name for the plain hash function
* Use int instead of size_t for iteration counts as it is
  the datatype used in the OpenSSL API. Otherwise we just
  have to much pain with constantly converting and might
  expose ourselves to size issues in the future.
* Moved new UserInfo enum entry to the end as to preserve
  the order
2014-10-03 01:19:29 +02:00
tkmorris
813aceb854 Add PBKDF2 support to Murmur. 2014-10-02 23:23:31 +02:00
Stefan Hacker
bc11185427 Update murmur.ini and scripts to disable dbus by default and enable ice.
Fixes #1083
2014-09-25 23:08:42 +02:00
Mikkel Krautz
92206cc551 Various murmur.ini fixes.
* Consistently refer to Mumrur as 'Murmur'.
 * Consistently end comments with a period.
 * Update the comments for logfile and pidfile
   to reflect what actually happens in practice.
2013-01-03 00:34:29 +01:00
Stefan Hacker
7f70a4a649 Fix typo in config and remote leftover debug statement in Meta.cpp 2012-12-08 22:41:22 +01:00
Stefan Hacker
f0c94f4505 Fix outdated comment on bonjour config option default value. 2012-12-08 22:21:25 +01:00
Stefan Hacker
9988e9a8a1 Improve murmur.ini documentation.
* Mention that values in there might be overridden with virtual server specific values
* Mention rules on value formating (no commas without quoting, escaping \ and so on)
2012-12-08 21:10:04 +01:00
Stefan Hacker
145d9f96f5 Introduce channel nesting limit (default=10).
Add NestingLimitException to Ice Interface and introduce a new NestingLimit PermissionDenied type.
Addresses #3566322 "ServerDB::deleteServer crashes master"
2012-09-18 17:50:07 +02:00
Benjamin Jemlich
f0c16f33ba Murmur: add Opus threshold option 2012-06-08 08:44:02 +02:00
Stefan Hacker
f9ab14c920 Add sendversion parameter to ini 2011-05-19 23:14:22 +02:00
Jamie Fraser
85feea3b56 Added ability to disable logging to DB 2010-07-30 13:34:05 +02:00
Tuck Therebelos
d0a66273e3 Source plugin updates; clarify regName parameter usage in Murmur.ini 2010-07-29 15:45:49 -05:00
Kissaki
fb7dbfe6f3 make icesecret comments clearer 2010-05-18 14:13:02 +02:00
Kissaki
372f763675 add some detail to the ini-comment 2010-04-17 14:46:57 +02:00
Kissaki
eda77d210a Fix spelling error in murmur.ini 2010-02-23 15:34:47 +01:00
Thorvald Natvig
7ba42b7902 Split icesecret in icesecretread and icesecretwrite 2010-02-15 18:18:06 +01:00
Thorvald Natvig
5cd6a1be95 Add icesecret .ini parameter to "protect" local Ice connections 2010-01-18 01:45:35 +01:00
Thorvald Natvig
c129ba404d Add imagemessagelength limit to server 2010-01-18 00:20:52 +01:00
Stefan Hacker
0c60717490 Add channelname and username var to murmur.ini to make them more visible 2009-11-22 01:34:31 +01:00
Benjamin Jemlich
3c050e9f83 Add an option to reject connections without a certificate 2009-11-18 23:46:09 +01:00
Thorvald Natvig
ede39c7405 Ice options in murmur.ini 2009-11-07 17:54:22 +01:00
Thorvald Natvig
8e79eae710 Allow stripping of HTML serverside 2009-09-19 02:58:08 +02:00
Thorvald Natvig
d9e706cb31 Make default bandwidth on server be 72 kbit/s 2009-09-09 15:21:30 +02:00
Thorvald Natvig
8911fdcd98 Update .ini text for pidfile 2009-08-29 21:37:43 +02:00
Thorvald Natvig
f8ba3747a6 Make the bandwidth limit on the server be in bit/s instead of byte/s 2009-08-19 23:13:18 +02:00
Stefan Hacker
6582af7d3c Bonjour support. 2009-07-15 18:48:34 +02:00
Thorvald Natvig
5049bead9c Mention that we really prefer SQLite in the .ini files 2009-05-01 19:03:11 +02:00
Thorvald Natvig
080c5867ba Create .ini files based on template 2009-03-09 23:40:53 +01:00
Kissaki
cb67fc150f updated murmur.ini documentation 2009-03-09 23:13:06 +01:00
Thorvald Natvig
a41c00bd6e Fix typo 2009-03-01 13:26:35 +01:00
Mikkel Krautz
3b124ce027 Add dbOpts setting. Allows users to specify custom connect options for their QSqlDatabase.
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1308 05730e5d-ab1b-0410-a4ac-84af385074fa
2008-09-12 14:31:07 +00:00
Thorvald Natvig
3b4cbea8ff Distribute Murmur.ice and php scripts with static binary
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1267 05730e5d-ab1b-0410-a4ac-84af385074fa
2008-08-31 14:29:40 +00:00
Thorvald Natvig
a95c1e5d60 Allow specification of ICE endpoint
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1189 05730e5d-ab1b-0410-a4ac-84af385074fa
2008-07-03 11:42:17 +00:00
Thorvald Natvig
3980fd7cbd Debian packaging fixes
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1142 05730e5d-ab1b-0410-a4ac-84af385074fa
2008-05-09 00:34:47 +00:00
Thorvald Natvig
0ada0c05e3 Extensive updates to ubuntu package (not quite done)
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@917 05730e5d-ab1b-0410-a4ac-84af385074fa
2008-01-15 02:31:38 +00:00
Thorvald Natvig
8b43b4231d Clean SQL log after adjustable interval, fetch logs via DBus
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@905 05730e5d-ab1b-0410-a4ac-84af385074fa
2007-12-14 23:52:34 +00:00
Thorvald Natvig
fed3ae2fcb Support setting dbus servie name [fitti_01]
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@867 05730e5d-ab1b-0410-a4ac-84af385074fa
2007-11-18 06:24:07 +00:00