1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
:LastChangedDate: $LastChangedDate$
:LastChangedRevision: $LastChangedRevision$
:LastChangedBy: $LastChangedBy$
Hacking
========================================
So you want to hack on Bitmask?
Thanks, and welcome!
Running tests
---------------------------------
Tox is all you need::
tox
Test when changes are made to common/soledad
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you are developing against a non-published branch of ``leap.common`` or
``leap.soledad``, run instead::
tox -e py27-dev
This expects ``leap_common`` and ``soledad`` repos to be checked out in the
parent folder.
Setting up the development environment
--------------------------------------
Dependencies::
sudo apt install build-essential python-dev python-virtualenv \
libsqlcipher-dev libssl-dev libffi-dev \
python-pyqt5 python-pyqt5.webkit
Clone the repo::
git clone https://0xacab.org/leap/bitmask-dev
cd bitmask-dev
Create a virtualenv and activate it::
virtualenv venv
source venv/bin/activate
By the way, if you plan to get into heavy development, you might want to
consider using something like `pew`_, instead of the plain virtualenv.
Now you should be able to install all the bitmask dependencies::
make dev-latest-all
.. _`pew`: https://pypi.python.org/pypi/pew
Main Bitmask Components
---------------------------------
The Core
~~~~~~~~
The main bitmask-dev repo orchestrates the launching if the bitmaskd daemon.
This is a collection of services that launches the vpn and mail services.
bitmask vpn, mail and keymanager are the main modules, and soledad is one of the
main dependencies for the mail service.
The Qt gui
~~~~~~~~~~
The Qt gui is a minimalistic wrapper that uses PyQt5 to launch the core and
display a qt-webkit browser rendering the resources served by the core. Its main
entrypoint is in ``gui/app.py``.
The Javascript UI
~~~~~~~~~~~~~~~~~
A modern javascript app is the main Bitmask Frontend. For instructions on how
to develop with the js ui, refer to ``ui/README.md``.
The Thunderbird Extension
~~~~~~~~~~~~~~~~~~~~~~~~~
The development for the Thunderbird Extension happens on `this repo`_.
This extension gets published to the `mozilla addons page`_.
.. _`this repo`: https://0xacab.org/leap/bitmask_thunderbird
.. _`mozilla addons page`: https://addons.mozilla.org/en-US/thunderbird/addon/bitmask
How to contribute code
---------------------------------
* Send your merge requests to https://0xacab/leap/bitmask-dev, it will be
subject to code-review.
* Please base your branch for master, and keep it rebased when you push.
* After review, please squash your commits.
Coding conventions
---------------------------------
* Follow pep8 for all the python code.
* Git messages should be informative.
* There is a pre-commit hook ready to be used in the ``docs/hooks`` folder,
alongside some other hooks to do autopep8 on each commit.
.. include:: ../hooks/leap-commit-template.README
:literal:
Dependencies
----------------------------------
We try hard not to introduce any new dependencies at this moment. If you really
have to, the packages bitmask depends on have to be specified *both* in the
setup.py and the pip requirements file.
Don't introduce any pinning in the setup.py file, they should go in the
requirements files (mainly ``pkg/requirements.pip``).
Signing your commits
---------------------------------
For contributors with commit access, you **should** sign all your commits. If
you are merging some code from external contributors, you should sign their
commits.
Merging code
---------------------------------
Avoid fast-forwards, they make a very messy history. Put this in your
gitconfig::
[merge]
ff = only
Making a new release
--------------------
A checklist for the release process can be found :ref:`here <release>`
As part of the release we also tag upload snapshots of the `leap.bitmask_js`
package, in order to allow installation of the javascript application without
needing to compile the javascript and html assets. This is done with::
cd ui
make dist-build
and then you can upload it to pypi::
make dist-upload
Contribution ideas
------------------
Want to help? Come talk to us on irc or the mailing list!
Some areas in which we always need contribution are:
* Localization of the client (talk to elijah).
* Multiplatform gitlab runners
* Windows and OSX packaging (talk to kali)
* Windows Firewall integration for VPN
* Migrating components to py3 (look for vshyba or kali).
|
