Commit Graph

384 Commits

Author SHA1 Message Date
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
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
Stefan Hacker
65c1affbdc Add generate-qrc.py script as a rcc -project replacement
One can use rcc -project to emit .qrc files for the contents of
a directory. However this functionality seems to be woefully incomplete
to the point of being broken.

This small python script offers the same functionality with more
options to customize and configure behaviour. This includes custom
prefixes, better handling of qrc file path vs. alias and exclusions.
2015-07-12 01:15:33 +02:00
Phil
0623c14ff6 changed sourceforge links to mumble.info links 2015-07-05 10:43:56 +02:00
Nikita Puzyryov
6db171eff4 Harden systemd service 2015-06-13 13:28:46 +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
Will Tange
0fdb7c17e5 Mark shebanged files as executable 2015-05-12 18:51:23 +02:00
Patrick Matthäi
0f072ef055 Add missing LSB Description to the init script.
Fixes SF bug #863 .
2015-04-27 22:58:12 +02:00
Christopher Knadle
e24cfe6cb8 Add Keywords to mumble.desktop to satisfy Lintian warning 2015-04-26 00:02:13 +02:00
x89
57396fac2f Add systemd service file for Murmur. 2015-04-22 22:03:19 +02:00
Kissaki
d0f6b965dd Make script for updating translation strings more robust 2015-04-12 00:02:37 +02:00
Mikkel Krautz
faa67303bd Move speex, celt-0.7.0, celt-0.11.0, opus and sbcelt to the 3rdparty directory. 2015-01-05 23:11:59 +01:00
Mikkel Krautz
93ad74b467 Add MinHook-based overlay for Windows x64.
This commit adds MinHook as a 3rd party
dependency and adds an alternative HardHook
implementation that makes use of MinHook.

This new MinHook-based HardHook implementation
allows us to provide an overlay for Mumble on
Windows x64.

The x64 overlay hasn't seen much testing in
real-world x64 games, except some minor testing
for World of Warcraft running in x64 mode, where
it works just fine.

There seems to be a compatibility with the Uplay
overlay, which causes Far Cry 4 to crash at the
"Press any key to continue" screen that is shown
just after launching the game. However,
Assassin's Creed: Unity works fine, so it might
just be a Far Cry 4 issue.

The x64 overlay also seems to interoperate with
the Steam overlay just fine.

I think this is a good starting point for the
feature. Let us get it into snapshots and let
us try to squash any addition bugs we find.
2015-01-03 19:44:02 +01:00
Stefan Hacker
88cf21d645 Merge pull request #1422 from hacst/auth
Use PBKDF2 for user password hashing (2)
2014-12-22 22:42:38 +01:00
Stefan Hacker
cbe3956e40 Fix more ApplicationPalette aspects.
* Getters actually have to be working
* Have to be able to reset palette parts that
  aren't overridden by theme.
* Add search folder when setting theme
2014-10-26 23:24:19 +01:00
Stefan Hacker
38807bef1a Integrate some feedback to ApplicationPalette
* Changed naming scheme from "qproperty-<group>_<role>"
  to "qproperty-<role>_<group>".
* Introduced "qproperty-<group>" to set all roles of the
  group to the same brush
2014-10-26 17:44:09 +01:00
Stefan Hacker
291ed489d9 Add ApplicationPalette class which allows theming the QApplication::palette.
Qt allows setting custom QPROPERTY values from QSS themes. As we cannot
style QPalettes this class has a property for each color group and
color role in a palette and acts as a stand-in for QApplication::palette
in the theme. When setting a qproperty-<group>-<role> on it in QSS
the brush will be set on the application palette.

The ApplicationPalette is derived from QWidget but never visible.
It listens to style changes on itself as those indicate the
application palette should be updated again. Variables not set
in the QSS will not be touched in the palette.

There might be some interactions with system style or theme changes
that have not yet been explored. Those are edge cases though and
can be fixed later.

ApplicationPalette.h is generated from ApplicationPaletteTemplate.h using
the generate-ApplicationPalette-class.py script. While it isn't expected
that this file has to change a lot in the future auto-generation is much
easier than writing all that boilerplate from hand.

Fixes #1438
2014-10-26 15:21:30 +01: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
67fc74f023 Build fixes for the debug variant of the win32-static/win64-static build envs. 2014-08-24 10:36:49 +02:00
Mikkel Krautz
c0d7aad069 scripts/gen-mumble_app-qt-def.py: add Python 3 compatibility. 2014-07-29 23:18:56 +02:00
Stefan Hacker
b3cf94fb7b Add translation update script with transifex issue workaround (#1195)
Script will do an lupdate run on mumble_en.ts, apply the duplication
of numerus tags workaround for the transifex missing string issue
(see #1195) and then create a commit with the updated translation
file. This file - at least for now - is meant to be run manually.
Make sure to check the created commit before pushing.
2014-04-27 01:51:28 +02:00
Stefan Hacker
e562e92e76 Exclude files with DFSG licensing issues from tar balls (#1230) 2014-04-26 23:59:57 +02:00
Stefan Hacker
b2529590e2 Missed DIST dependency on mkini.sh results. 2014-03-27 17:14:19 +01:00
Stefan Hacker
c03d8fcc73 Drastically simplify release.pl.
Previously release.pl did complex parsing of .pro
files to figure out which files to include in the
tar ball.

This change removes this logic and instead performs
the minimal modifications needed under the assumption
of a clean tree and then uses system tools to create
the tar.gz and zip files.
2014-03-25 22:24:06 +01:00
Mikkel Krautz
44a5bd1219 scripts: remove unused svn2cl scripts. 2014-01-12 22:09:04 +01:00
Mikkel Krautz
97b75de204 scripts: remove old Ermine build scripts.
We have an updated variant in Jenkins which builds on CentOS instead
of Ubuntu.
2014-01-12 22:06:50 +01:00
Mikkel Krautz
64abcb3834 scripts: set +x bit for the files people are expected to run. 2014-01-12 22:02:56 +01:00
Mikkel Krautz
f623a695ca scripts/mkini-win32.bat: use ',' as substitution delimiter; also fix regexp.
Using '!' as the delimiter has an unfortunate clash with cmd.exe's
delayed expansion feature. When delayed expansion is enabled, the
substitution would fail with a syntax error because cmd.exe had
mangled the substitution string before passing it to Perl.

This commit also fixes the regular expression to match the one
found in mkini.sh.
2014-01-12 21:59:35 +01:00
Mikkel Krautz
4323a21b83 scripts/release.pl: remove slicer-specific deployment functionality.
Nobody is using release.pl for deploying tarballs
automatically anymore.

Our builder bots were manually sed'ing out these
parts of the code before running release.pl, so by
dropping it completely, we can clean up their build
scripts a bit.
2014-01-12 13:56:39 +01:00
Mikkel Krautz
00b3686346 scripts/release.pl: add vpath special-case for fx11. 2014-01-10 23:46:30 +01:00
Mikkel Krautz
6918c9de93 scripts/release.pl: add dirs new to Opus 1.1 to fix from-tarball build. 2013-12-15 15:27:15 +01:00
Mikkel Krautz
192135db54 Add x-scheme-handler support to the Mumble .desktop file.
This is the modern way to handle application-specific URL schemes
on the various desktop environments on Unix-like systems.

Fixes #1061 (reported by Chris Knadle; thanks!)

Originally fixed in Ubuntu via
https://bugs.launchpad.net/ubuntu/+source/mumble/+bug/934239
2013-11-10 14:03:28 +01:00
Stefan Hacker
42d74df5ec Fix channel flag handling with filter patch
- Channel comment flags were no longer clickable because
  filters weren't considered in offset calculation.
- What's this text didn't contain the flag icon
- Lowercased Flag.svg
- Magic numbers and abbreviation refactoring
- Lowercased Filter.svg and improved license display
2013-09-19 00:23:48 +02:00
Mikkel Krautz
bcf1a3e539 build: add support for building against Qt 5 from the win32-static build env. 2013-09-15 22:47:54 +02:00
Mikkel Krautz
6da29305b8 mumble, murmur: final adjustments for the win32-static buildenv.
With this change, CONFIG(static) on Windows will cause the Mumble client's
application logic to be built into a .DLL called mumble_app.dll
(based on pcgod's previous DLL changeset).

Since src/mumble will now be built as a DLL, a wrapper executable is available
in src/mumble_exe. This wrapper is currently implemented such that it will
load mumble_app.dll from the directory that it resides in.

This means that when building statically, src/mumble and src/mumble_exe will
now give us the following products:

  src/mumble:      mumble_app.dll
  src/mumble_exe:  mumble.exe

Along with the two major points above, this change also adds a Python script
to the build, 'gen-mumble_app-qt-def.py', whose job is to construct a module
definition (.def) file for mumble_app.dll. The generated module definition
lists the Qt symbols that are needed for the manual positioning plugin to work.

If we need to expose more symbols in the future (say we want to implement
more plugin kinds than the current positional audio plugins), we now have
the infrastructure in place to do that.
2013-08-25 13:22:38 +02:00
Kissaki
8021c66170 Refac mklic.pl. Generate new licenses.h file.
* Adjust the mklic.pl so it generates and uses the newly introduced ThirdPartyLicense struct
* Misc improvements (newline cleanups, varnaming)
* Generate new licenses.h file via mklic.pl
2013-07-14 13:23:25 +02:00
Kissaki
82fa0e60e7 Adjust mklic.pl script
* Fix mixup of CELT and Speex licenses in about dialog.
* Add filter.svg icon license information
2013-07-14 12:48:23 +02:00
Kissaki
d74b5b04db IconSync.cpp: Move Icon creation script
* Move Icon creation script/program to the scripts folder.
It is definitely not a test.
* Introduce scripts/development folder for development scripts, in contrary to scripts/server for example.
2013-06-15 23:31:11 +02:00
Stefan Hacker
7d649aa5fc Make sure mklic.pl always outputs LF endings 2013-06-04 22:37:25 +02:00