Commit Graph

426 Commits

Author SHA1 Message Date
Tim Cooper
59bda9bec8 grpc: rename murmur.ini.grpc to murmur.grpc.ini 2016-05-08 16:45:52 +02:00
Mikkel Krautz
75d68fb473 grpc: sync murmur.ini.grpc with murmur.ini. 2016-05-08 16:45:52 +02:00
Tim Cooper
ff109d96f0 grpc: integrate murmur_grpc_wrapper_gen into qmake build 2016-05-08 16:45:52 +02:00
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
d4b799deb9 grpc: add RPCSingleStreamCall base for single-streaming wrappers 2016-05-08 16:45:52 +02:00
Tim Cooper
0cbd230d8f grpc: reduce amount of generated wrapper code 2016-05-08 16:45:52 +02:00
Tim Cooper
c7686ff0a5 grpc: fix possible use-after-frees with the GRPC wrappers 2016-05-08 16:45:52 +02:00
Tim Cooper
89b487cd17 grpc: reduce compile warnings 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
c53134dce1 grpc: simplify authenticator slots 2016-05-08 16:45:52 +02:00
Tim Cooper
fd52a050f2 grpc: make RPCCall.error's argument const 2016-05-08 16:45:52 +02:00
Tim Cooper
d63b5c7f47 grpc: add "request", "response" to stream-stream wrapper 2016-05-08 16:45:52 +02:00
Tim Cooper
3af2bc8a1f grpc: rename "response" in generated code to "stream" 2016-05-08 16:45:52 +02:00
Tim Cooper
5b2f2b966a grpc: generate callback() for "stream-stream" RPC methods 2016-05-08 16:45:52 +02:00
Tim Cooper
39984f6c60 grpc: add timer that will trigger cleanup function every minute 2016-05-08 16:45:52 +02:00
Tim Cooper
3a1da385b9 grpc: add callback() method to single-streaming calls, reenable ContextActionService.Events 2016-05-08 16:45:52 +02:00
Tim Cooper
0fdb1dfb06 grpc: RPCCall::error does not need to be a function anymore 2016-05-08 16:45:52 +02:00
Tim Cooper
a89333dfa0 grpc: pass grpc success variable to callback functions 2016-05-08 16:45:52 +02:00
Tim Cooper
1b3cdd8fa9 grpc: re-enable streaming wrapper generation 2016-05-08 16:45:52 +02:00
Tim Cooper
c386db3db1 grpc: rework non-streaming call wrappers, temporary disable streaming calls 2016-05-08 16:45:52 +02:00
Tim Cooper
b6aca4937d grpc: implemented streaming generator, temporary removed certain streaming RPC methods 2016-05-08 16:45:52 +02:00
Tim Cooper
e233c538ca grpc: add exception hander around *_Impl to ease error handing 2016-05-08 16:45:52 +02:00
Tim Cooper
0041ab3ee3 grpc: switch to async grpc API, change naming of service methods 2016-05-08 16:45:52 +02:00
Tim Cooper
d181c0d1d6 grpc: add *_Init to protoc-gen-grpcwrapper 2016-05-08 16:45:52 +02:00
Tim Cooper
05a450119d grpc: remove MurmurRPCImpl and AsyncService from _Impl signature 2016-05-08 16:45:52 +02:00
Tim Cooper
d749e0f167 grpc: add protoc-gen-grpcwrapper.cpp 2016-05-08 16:45:52 +02:00
Tim Cooper
776c084a1a grpc: start implementation 2016-05-08 16:45:52 +02:00
Mikkel Krautz
0d35a9c77f scripts/ts2html.pl: remove.
We have no use for this script that converts
.ts files to .html for easier human consumption.

We now use Transifex for even easier localization.

Delete the file.
2016-05-07 14:32:45 +02:00
Mikkel Krautz
6d2364a809 scripts/qt.conf: remove.
Previously, qt.conf was used to sepecify the runtime
plugin path for Qt in our dynamic Windows and OS X
builds.

Now that those builds use static Qt, the file is
unused.

Delete it.
2016-05-07 14:32:16 +02:00
Mikkel Krautz
d475b446dc scripts/generate-AUTHORS.py: use pyuca for sorting to get deterministic output on all platforms.
My own rule of thumb for scripts in our repo is to keep the
number dependencies down. In practice, this means I always
strive to only use the standard library.

In this case, it's not that easy.

The existing code sorted sufficiently on Windows.

However, when run on Unix-like systems, it produces odd, and
to my mind, unexpected sorting behavior. (Such as ignoring spaces,
and sorting 'Hey You' after 'Heyh You'.)

I suppose the sort order is a matter of preference.

But the non-determinism of the script's output isn't.
If we don't fix this, we'll get noisy diffs once in a while,
which isn't very nice.

This commit changes the script to use 'pyuca' to
do the sorting. This is a pure Python module, so
it's easy to install via pip on all OSes.
2016-05-06 13:38:36 +02:00
Mikkel Krautz
9f20c2184e scripts/generate-AUTHORS.py: use 'origin/branch' instead of just 'branch' in git log call.
This allows the script to work even if, say, origin/1.2.x is not checked
out locally as '1.2.x'.
2016-05-01 00:55:58 +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
5c17181b02 Move smallft to 3rdparty/smallft-src and add to 3rdPartyLicenses.
The smallft code is not under Mumble's license, so it should
live under 3rdparty, and have a proper license notice in our
binaries.
2016-04-28 13:11:33 +02:00
Mikkel Krautz
b03a6890f3 Add .mailmap file and us it in scripts/generate-AUTHORS.py.
Also, re-generate the AUTHORS file as a self-test.

Fixes mumble-voip/mumble#2125
2016-03-13 13:35:46 +01:00
Mikkel Krautz
6beb46e631 Move src/bonjour to 3rdparty/qqbonjour-src and add its license to the third party license list.
Fixes mumble-voip/mumble#2160
2016-03-13 13:30:56 +01:00
Mikkel Krautz
6f1331b2e6 GlobalShortcutWin: Exclude XInput devices from DirectInput.
This adds a dependency on a small library, XInputCheck, which is
a function abstracted away from SDL. All it does is check whether
a given DirectInput guidProduct is an XInput device.
2016-03-03 16:13:26 +01:00
Mikkel Krautz
3b2a169f46 Simplify LICENSE file, add LICENSE.header and add AUTHORS.
This simplifies the LICENSE file refer to the copyright
holders of Mumble as "The Mumble Developers". The client
already does this in the About dialog.

The entity "The Mumble Developers" is the name we use for
the copyright holders of Mumble. These are listed in the
AUTHORS file.

The AUTHORS file is generated via scripts/generate-AUTHORS.py.
The script looks at the Git history and removes duplicates and
other mistakes made through the years.

All new files in the repo should use the license header found
in LICENSE.header.

The AUTHORS and LICENSE files are permalinked to

    https://www.mumble.info/LICENSE
    https://www.mumble.info/AUTHORS

These locations are used in the files themselves,
as well as the license header.
2016-02-20 01:13:38 +01:00
Roman Priesol
21673bf426 mumble.desktop: added missing semicolons
.desktop file needs a semicolon (';') as trailing character for multiple keys.
2015-12-06 18:30:36 +01: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
0e4070c11d scripts/updatetranslations.sh: fix shebang to work on systems where bash doesn't live in /bin. 2015-11-22 21:26:55 +01:00
Mikkel Krautz
e94c8f7a03 Use Emoji One SVGs for our flag icons instead of FamFamFam.
While the FamFamFam icons have served us well, we really
need SVG flag icons for HiDPI scenarios.

This is one of the last pieces missing to allow us to
claim we fully support Retina displays on OS X.
2015-11-17 00:13:59 +01:00
Stefan Hacker
0db712ed93 Make mkwrapper.pl write a banner to its generated files
In each generated file we want to have a banner that warns of
modification by hand and indicates the generator responsible
for the file. This patch extends mkwrapper.pl to write such
a header.

It also switches mkwrapper.pl away from barewords for file-handles.
Apparently those are no longer considered idiomatic Perl and they
broke the "iterate over list of handles" thing this patch does.
2015-10-25 19:40:11 +01:00
Stefan Hacker
a8bed2987c Modify generator for licenses.h to fix warnings in that file 2015-10-25 19:40:11 +01:00
Stefan Hacker
73f6051d35 Modify generator for ApplicationPalette.h to fix warnings in that file 2015-10-25 19:40:10 +01:00
Mikkel Krautz
311f6f7e86 Auto-generate qrc file for embedded Qt translations when running qmake.
This change removes our qmake-based Qt translation embedding.

That system uses mumble_qt.qrc resource file with
hardcoded filenames for Qt translations, and some logic
implemented in qmake that copies Qt translations into
the Mumble source tree such that the paths in the
mumble_qt.qrc file match.

The new system introduces a simple Python script that
takes an output filename for the .qrc file the tool
will write, along with a set of directories containing
Qt translations.

The tool will generate a Qt resource file containing
references to all the translation files found in the
specified directories. However, the tool takes care
to only include language files once.

In typical use, the first directory parameter passed
to the tool is the QT_INSTALL_TRANSLATIONS directory,
which is where Qt stores its own translation files.
The second directory is Mumble's fallback directory.

The tool then goes through all files in the first
directory, and notes down which languages have been
processed. Multiple files for a single langauge can
be included from the a directory (qt_help_da.qm,
and qtbase_da.qm), but once a language has been
added from one directory, it will not be added
if found in the next one in line.

We use this to include a set of 'fallback'
translations for versions of Qt that do not
include them. This also allows this new style
of Qt translation embedding to be forward
compatible with newer versions of Qt that
add new translations.

Once Qt includes a translation that we have
in our fallback directory, the Qt translation
is used instead.
2015-10-17 21:47:42 +02:00
Mikkel Krautz
a5009b64be Fix "RCC: Error in [...]" output that appears when running qmake.
This change removes the "RCC Error:" output that appears
when running "qmake -recursive main.pro".

The qmake tool's resources feature (resources.prf) invokes
"rcc -list <input>.qrc" to determine which files to add as
dependencies for the rcc target (for the given <input>.qrc)
in the generated Makefile.

When invoking "rcc -list [...]" on some of our .qrc files,
we get errors, such as:

    RCC: Error in 'mumble.qrc': Cannot find file 'mumble_cs.qm'
    RCC: Error in 'mumble.qrc': Cannot find file 'mumble_da.qm'
    RCC: Error in 'mumble.qrc': Cannot find file 'mumble_de.qm'
    [...]

This is because our .qrc files include references to files
that are generated when we invoke the Makefile.

Unfortunately, the invocation of "rcc -list [...]" happens
during the qmake invocation, and not when running "make".
So the files simply do not exist yet.

This change replaces the qmake "rcc" extra compiler's
"depend_command" to be a script we wrote ourselves, namely
rcc-depends.py, that lives in the scripts directory.

This script does practically the same thing as invoking
"rcc -list", but it does not care if the files exist yet
or not. It expects that they do.

The result is that all files listed in a .qrc file are now
properly added as dependencies for the Makefile rule that
invokes rcc to process the .qrc file. This did not happen
before.

So, a positive side-effect of this change is that our
Makefile is now able to order things correctly itself,
even for auto-generated files in .qrc files. Before, we
had to give it hints. These hints are still in place,
such as:

    lrel.variable_out = rcc.depends

and

    copytrans.variable_out = rcc.depends

both from mumble.pro. These hints are used to order
the lrel and copytrans targets before rcc is invoked
in the generated Makefile. However, now that all files
are output as dependency information in the Makefile,
this should not strictly be necessary.

This change has been tested with both Qt 4 and Qt 5, on
Windows and Linux.
2015-10-13 20:44:57 +02:00
Mikkel Krautz
8e195e1766 Use lookup table for cipher info in 'Connection Info' dialog.
This patch introduces a lookup table that allows us to retrieve
additional IETF TLS parameters based on the ciphersuite name
provided by Qt/OpenSSL. With this additional information we can
have the detailed output we want to have for the connection
info dialog.

The table is generated by the generate-cipherinfo.py script
which uses a heuristic to select a representative set of
suites we might to expect to see from the the official IETF
TLS parameter descriptions.

Should we not find the cipher suite a connection ended up
using in this table we will fall back to less detailed output
which the user can use to find the specific parameters.

This patch also contains some other minor changes to the dialog.
2015-10-04 12:42:52 +02: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