Bump to v0.11.0

.github/workflows/createrelease.yml

@@ -1,11 +1,11 @@
+name: Create GitHub release
+
 on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
-name: Create Release
-
 jobs:
   build:
     name: Create Release

.github/workflows/pythonpublish.yml

@@ -1,4 +1,4 @@
-name: Upload Python Package
+name: Publish at pypi.org
 
 on:
   release:

.github/workflows/pythonpublishtest.yml

@@ -1,4 +1,4 @@
-name: Upload Python Test Package
+name: Publish at test.pypi.org
 
 on:
   release:

.github/workflows/testpackage.yml

@@ -0,0 +1,36 @@
+name: Test package
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+    - name: Install package
+      run: |
+        pip install -e .
+    - name: Check format with yapf
+      run: |
+        pip install yapf
+        yapf . -r --diff
+    - name: Lint with flake8
+      run: |
+        pip install flake8
+        flake8 . --count --show-source --statistics
+    - name: Test with pytest
+      run: |
+        pip install pytest
+        pytest

LICENSE

@@ -619,464 +619,3 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
-
-
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS

Makefile

@@ -0,0 +1,30 @@
+.PHONY: ci checkformat lint test autoformat
+
+VENV=venv
+PYTHON=$(VENV)/bin/python3
+
+ci: checkformat lint test
+
+$(VENV): $(VENV)/bin/activate
+
+$(VENV)/bin/activate: setup.py requirements-dev.txt Makefile
+ifeq (, $(shell which virtualenv))
+	$(error "`virtualenv` is not installed, consider running `pip3 install virtualenv`")
+endif
+	test -d $(VENV) || virtualenv -p python3 $(VENV)
+	$(PYTHON) -m pip install --upgrade pip
+	$(PYTHON) -m pip install -r requirements-dev.txt
+	$(PYTHON) -m pip install -e .
+	touch $(VENV)/bin/activate
+
+checkformat: $(VENV)
+	$(PYTHON) -m yapf . -r --diff --exclude $(VENV)
+
+lint: $(VENV)	
+	$(PYTHON) -m flake8 . --count --show-source --statistics --exclude $(VENV)
+
+test: $(VENV)
+	$(PYTHON) -m pytest
+
+autoformat: $(VENV)
+	$(PYTHON) -m yapf . -r --in-place --exclude $(VENV)

README.md

@@ -102,6 +102,4 @@ OpenDrop is the result of a research project and, thus, has several limitations
 
 ## License
 
-OpenDrop is licensed under the **GNU General Public License v3.0**.
-We use a modified version of the [`python-zeroconf`](https://pypi.org/project/zeroconf/) package (essentially adding rudimentary IPv6 and AWDL support) which is licensed under the **GNU Lesser General Public License v2.1**.
-Both licenses are found in the `LICENSE` file.
+OpenDrop is licensed under the [**GNU General Public License v3.0**](LICENSE).

opendrop/__init__.py

@@ -18,15 +18,15 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
 import logging
-import platform
 import os
+import platform
 
-__version__ = '0.10.3'
+__version__ = '0.11.0'
 
 if platform.system() == 'Darwin':
-	dyld_path = os.environ.get('DYLD_LIBRARY_PATH', '')  # save old path
-	openssl_path = '/usr/local/opt/openssl/lib'
-	archive_path = '/usr/local/opt/libarchive/lib'
-	os.environ['DYLD_LIBRARY_PATH'] = '{}:{}:{}'.format(dyld_path, openssl_path, archive_path)
+    dyld_path = os.environ.get('DYLD_LIBRARY_PATH', '')  # save old path
+    openssl_path = '/usr/local/opt/openssl/lib'
+    archive_path = '/usr/local/opt/libarchive/lib'
+    os.environ['DYLD_LIBRARY_PATH'] = '{}:{}:{}'.format(dyld_path, openssl_path, archive_path)
 
 logger = logging.getLogger(__name__)

opendrop/cli.py

@@ -17,15 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-import time
-
-import ipaddress
-import logging
 import argparse
-import sys
 import json
+import logging
 import os
+import sys
 import threading
+import time
 
 from .client import AirDropBrowser, AirDropClient
 from .config import AirDropConfig, AirDropReceiverFlags
@@ -39,7 +37,6 @@ def main():
 
 
 class AirDropCli:
-
     def __init__(self, args):
         parser = argparse.ArgumentParser()
         parser.add_argument('action', choices=['receive', 'find', 'send'])
@@ -60,9 +57,12 @@ class AirDropCli:
 
         # TODO put emails and phone in canonical form (lower case, no '+' sign, etc.)
 
-        self.config = AirDropConfig(email=args.email, phone=args.phone,
-                                    computer_name=args.name, computer_model=args.model,
-                                    debug=args.debug, interface=args.interface)
+        self.config = AirDropConfig(email=args.email,
+                                    phone=args.phone,
+                                    computer_name=args.name,
+                                    computer_model=args.model,
+                                    debug=args.debug,
+                                    interface=args.interface)
         self.server = None
         self.client = None
         self.browser = None
@@ -106,27 +106,31 @@ class AirDropCli:
                 json.dump(self.discover, f)
 
     def _found_receiver(self, info):
-        thread = threading.Thread(target=self._send_discover, args=(info,))
+        thread = threading.Thread(target=self._send_discover, args=(info, ))
         thread.start()
 
     def _send_discover(self, info):
         try:
-            address = ipaddress.ip_address(info.address).compressed
-        except ValueError:
-            return  # not a valid address
+            address = info.parsed_addresses()[0]  # there should only be one address
+        except IndexError:
+            logger.warn('Ignoring receiver with missing address {}'.format(info))
+            return
         id = info.name.split('.')[0]
         hostname = info.server
         port = int(info.port)
         logger.debug('AirDrop service found: {}, {}:{}, ID {}'.format(hostname, address, port, id))
         client = AirDropClient(self.config, (address, int(port)))
-        flags = int(info.properties[b'flags'])
+        try:
+            flags = int(info.properties[b'flags'])
+        except KeyError:
+            # TODO in some cases, `flags` are not set in service info; for now we'll try anyway
+            flags = AirDropReceiverFlags.SUPPORTS_DISCOVER_MAYBE
 
         if flags & AirDropReceiverFlags.SUPPORTS_DISCOVER_MAYBE:
             try:
                 receiver_name = client.send_discover()
             except TimeoutError:
                 receiver_name = None
-                pass
         else:
             receiver_name = None
         discoverable = receiver_name is not None
@@ -144,6 +148,8 @@ class AirDropCli:
         self.discover.append(node_info)
         if discoverable:
             logger.info('Found  index {}  ID {}  name {}'.format(index, id, receiver_name))
+        else:
+            logger.debug('Receiver ID {} is not discoverable'.format(id))
         self.lock.release()
 
     def receive(self):
@@ -186,7 +192,7 @@ class AirDropCli:
         except IndexError:
             pass
         # (2) try 'id'
-        if len(self.receiver) is 12:
+        if len(self.receiver) == 12:
             for info in infos:
                 if info['id'] == self.receiver:
                     return info

opendrop/client.py

@@ -17,36 +17,37 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-import fleep
-import http
+import io
 import ipaddress
 import logging
 import os
-import io
-import libarchive
 import platform
 import plistlib
 import socket
-from http import client
+from http.client import HTTPSConnection
+
+import fleep
+import libarchive
 
 from .util import AirDropUtil, AbsArchiveWrite
-from .zeroconf import ServiceBrowser, Zeroconf
+from zeroconf import ServiceBrowser, Zeroconf, IPVersion
 
 logger = logging.getLogger(__name__)
 
 
 class AirDropBrowser:
-
     def __init__(self, config):
         self.ip_addr = AirDropUtil.get_ip_for_interface(config.interface, ipv6=True)
         if self.ip_addr is None:
-            if config.interface is 'awdl0':
+            if config.interface == 'awdl0':
                 raise RuntimeError('Interface {} does not have an IPv6 address. '
                                    'Make sure that `owl` is running.'.format(config.interface))
             else:
                 raise RuntimeError('Interface {} does not have an IPv6 address'.format(config.interface))
 
-        self.zeroconf = Zeroconf(interfaces=[self.ip_addr], ipv6_interface_name=config.interface)
+        self.zeroconf = Zeroconf(interfaces=[str(self.ip_addr)],
+                                 ip_version=IPVersion.V6Only,
+                                 apple_p2p=platform.system() == 'Darwin')
 
         self.callback_add = None
         self.callback_remove = None
@@ -81,7 +82,6 @@ class AirDropBrowser:
 
 
 class AirDropClient:
-
     def __init__(self, config, receiver):
         self.config = config
         self.receiver_host = receiver[0]
@@ -99,7 +99,8 @@ class AirDropClient:
                 _headers[key] = val
         if self.http_conn is None:
             # Use single connection
-            self.http_conn = HTTPSConnectionAWDL(self.receiver_host, self.receiver_port,
+            self.http_conn = HTTPSConnectionAWDL(self.receiver_host,
+                                                 self.receiver_port,
                                                  interface_name=self.config.interface,
                                                  context=self.config.get_ssl_context())
         self.http_conn.request('POST', url, body=body, headers=_headers)
@@ -162,6 +163,7 @@ class AirDropClient:
                     'ConvertMediaFormats': 0
                 }
                 yield file_entry
+
         ask_body['Files'] = [e for e in file_entries(file_path)]
         ask_body['Items'] = []
 
@@ -196,7 +198,7 @@ class AirDropClient:
 
     def _get_headers(self):
         """
-        Get the headers for requests sent 
+        Get the headers for requests sent
         """
         headers = {
             'Content-Type': 'application/octet-stream',
@@ -209,13 +211,21 @@ class AirDropClient:
         return headers
 
 
-class HTTPSConnectionAWDL(http.client.HTTPSConnection):
+class HTTPSConnectionAWDL(HTTPSConnection):
     """
     This class allows to bind the HTTPConnection to a specific network interface
     """
-
-    def __init__(self, host, port=None, key_file=None, cert_file=None, timeout=None, source_address=None,
-                 *, context=None, check_hostname=None, interface_name=None):
+    def __init__(self,
+                 host,
+                 port=None,
+                 key_file=None,
+                 cert_file=None,
+                 timeout=None,
+                 source_address=None,
+                 *,
+                 context=None,
+                 check_hostname=None,
+                 interface_name=None):
 
         if interface_name is not None:
             if '%' not in host:
@@ -225,8 +235,13 @@ class HTTPSConnectionAWDL(http.client.HTTPSConnection):
         if timeout is None:
             timeout = socket.getdefaulttimeout()
 
-        super(HTTPSConnectionAWDL, self).__init__(host=host, port=port, key_file=key_file, cert_file=cert_file,
-                                                  timeout=timeout, source_address=source_address, context=context,
+        super(HTTPSConnectionAWDL, self).__init__(host=host,
+                                                  port=port,
+                                                  key_file=key_file,
+                                                  cert_file=cert_file,
+                                                  timeout=timeout,
+                                                  source_address=source_address,
+                                                  context=context,
                                                   check_hostname=check_hostname)
 
         self.interface_name = interface_name
@@ -260,7 +275,6 @@ class HTTPSConnectionAWDL(http.client.HTTPSConnection):
                     sock.bind(source_address)
                 sock.connect(sa)
                 # Break explicitly a reference cycle
-                err = None
                 return sock
 
             except socket.error as _:

opendrop/config.py

@@ -17,14 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-import os
 import logging
-from pkg_resources import resource_filename
+import os
+import random
 import socket
 import ssl
-import random
 import subprocess
 
+from pkg_resources import resource_filename
+
 logger = logging.getLogger(__name__)
 
 
@@ -45,10 +46,17 @@ class AirDropReceiverFlags:
 
 
 class AirDropConfig:
-
-    def __init__(self, host_name=None, computer_name=None, computer_model=None, server_port=8771,
-                 airdrop_dir='~/.opendrop', service_id=None,
-                 email=None, phone=None, debug=False, interface=None):
+    def __init__(self,
+                 host_name=None,
+                 computer_name=None,
+                 computer_model=None,
+                 server_port=8771,
+                 airdrop_dir='~/.opendrop',
+                 service_id=None,
+                 email=None,
+                 phone=None,
+                 debug=False,
+                 interface=None):
         self.airdrop_dir = os.path.expanduser(airdrop_dir)
 
         self.discovery_report = os.path.join(self.airdrop_dir, 'discover.last.json')
@@ -104,14 +112,18 @@ class AirDropConfig:
         logger.info('Create new self-signed certificate in {}'.format(self.key_dir))
         if not os.path.exists(self.key_dir):
             os.makedirs(self.key_dir)
-        subprocess.run(['openssl', 'req', '-newkey', 'rsa:2048', '-nodes', '-keyout', 'key.pem',
-                        '-x509', '-days', '365', '-out', 'certificate.pem',
-                        '-subj', '/CN={}'.format(self.computer_name)], cwd=self.key_dir,
-                       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run([
+            'openssl', 'req', '-newkey', 'rsa:2048', '-nodes', '-keyout', 'key.pem', '-x509', '-days', '365', '-out',
+            'certificate.pem', '-subj', '/CN={}'.format(self.computer_name)
+        ],
+                       cwd=self.key_dir,
+                       stdout=subprocess.PIPE,
+                       stderr=subprocess.PIPE)
 
     def get_ssl_context(self):
-        sslctxt = ssl.SSLContext()
-        sslctxt.load_cert_chain(self.cert_file, keyfile=self.key_file)
-        sslctxt.load_verify_locations(cafile=self.root_ca_file)
-        sslctxt.verify_mode = ssl.CERT_NONE  # we accept self-signed certificates as does Apple
-        return sslctxt
+        ctx = ssl.SSLContext(ssl.PROTOCOL_TLS)
+        ctx.options |= ssl.OP_NO_TLSv1  # TLSv1.0 is insecure
+        ctx.load_cert_chain(self.cert_file, keyfile=self.key_file)
+        ctx.load_verify_locations(cafile=self.root_ca_file)
+        ctx.verify_mode = ssl.CERT_NONE  # we accept self-signed certificates as does Apple
+        return ctx

opendrop/server.py

@@ -17,20 +17,20 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 import io
-
+import json
 import logging
 import platform
 import plistlib
 import socket
+import time
 from http.server import HTTPServer, BaseHTTPRequestHandler
-import json
+
 import libarchive
 import libarchive.extract
 import libarchive.read
-from .zeroconf import Zeroconf, ServiceInfo
-import time
 
 from .util import AirDropUtil
+from zeroconf import Zeroconf, ServiceInfo, IPVersion
 
 logger = logging.getLogger(__name__)
 
@@ -39,7 +39,6 @@ class AirDropServer:
     """
     Announces an HTTPS AirDrop server in the local network via mDNS.
     """
-
     def __init__(self, config):
         self.config = config
 
@@ -50,7 +49,7 @@ class AirDropServer:
 
         self.ip_addr = AirDropUtil.get_ip_for_interface(self.config.interface, ipv6=True)
         if self.ip_addr is None:
-            if self.config.interface is 'awdl0':
+            if self.config.interface == 'awdl0':
                 raise RuntimeError('Interface {} does not have an IPv6 address. '
                                    'Make sure that `owl` is running.'.format(self.config.interface))
             else:
@@ -59,8 +58,9 @@ class AirDropServer:
         self.Handler = AirDropServerHandler
         self.Handler.config = self.config
 
-        self.zeroconf = Zeroconf(interfaces=[self.ip_addr], ipv6_interface_name=self.config.interface,
-                                 apple_mdns=True)
+        self.zeroconf = Zeroconf(interfaces=[str(self.ip_addr)],
+                                 ip_version=IPVersion.V6Only,
+                                 apple_p2p=platform.system() == 'Darwin')
 
         self.http_server = self._init_server()
         self.service_info = self._init_service()
@@ -69,14 +69,17 @@ class AirDropServer:
         properties = self.get_properties()
         server = self.config.host_name + '.local.'
         service_name = self.config.service_id + '._airdrop._tcp.local.'
-        info = ServiceInfo(
-            '_airdrop._tcp.local.', service_name,
-            self.ip_addr.packed, self.config.port, 0, 0, properties, server)
+        info = ServiceInfo('_airdrop._tcp.local.',
+                           service_name,
+                           port=self.config.port,
+                           properties=properties,
+                           server=server,
+                           addresses=[self.ip_addr.packed])
         return info
 
     def start_service(self):
-        logger.info('Announcing service: host {}, address {}, port {}'.format(self.config.host_name,
-                                                                              self.ip_addr, self.config.port))
+        logger.info('Announcing service: host {}, address {}, port {}'.format(self.config.host_name, self.ip_addr,
+                                                                              self.config.port))
         self.zeroconf.register_service(self.service_info)
 
     def _init_server(self):
@@ -204,8 +207,7 @@ class AirDropServerHandler(BaseHTTPRequestHandler):
 
         AirDropUtil.write_debug(self.config, post_data, 'receive_ask_request.plist')
 
-        ask_response = {'ReceiverModelName': self.config.computer_model,
-                        'ReceiverComputerName': self.config.computer_name}
+        ask_response = {'ReceiverModelName': self.config.computer_model, 'ReceiverComputerName': self.config.computer_name}
         ask_resp_binary = plistlib.dumps(ask_response, fmt=plistlib.FMT_BINARY)
 
         AirDropUtil.write_debug(self.config, ask_resp_binary, 'receive_ask_response.plist')
@@ -246,18 +248,18 @@ class AirDropServerHandler(BaseHTTPRequestHandler):
                 self.total = 0
 
             def _next_chunk(self):
-                if self.chunk is None or len(self.chunk) is 0:
+                if self.chunk is None or len(self.chunk) == 0:
                     length = int(self.rfile.readline().rstrip(), 16)
                     self.chunk = self.rfile.read(length)
                     self.rfile.readline()  # strip trailing \n\r
 
             def readinto(self, buf):
                 self._next_chunk()
-                l = min(len(self.chunk), len(buf))
-                buf[:l] = self.chunk[:l]
-                self.chunk = self.chunk[l:]
-                self.total += l
-                return l
+                length = min(len(self.chunk), len(buf))
+                buf[:length] = self.chunk[:length]
+                self.chunk = self.chunk[length:]
+                self.total += length
+                return length
 
         def extract_stream(stream, flags=0):
             """

opendrop/util.py

@@ -19,13 +19,15 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import base64
 import datetime
+import hashlib
 import io
 import ipaddress
 import os
 import plistlib
-import hashlib
+
 import ifaddr
 from PIL import Image, ExifTags
+from ctypescrypto import cms, x509, pkey, oid
 from libarchive import ffi
 from libarchive.entry import new_archive_entry, ArchiveEntry
 from libarchive.ffi import (
@@ -39,7 +41,6 @@ from libarchive.ffi import (
     write_finish_entry,
 )
 from libarchive.write import ArchiveWrite, new_archive_read_disk
-from ctypescrypto import cms, x509, pkey, oid
 
 
 class AirDropUtil:
@@ -47,13 +48,12 @@ class AirDropUtil:
     This class contains a set of utility functions that support the opendrop implementation
     They have been moved, because the opendrop files tend to get too long
     """
-
     @staticmethod
     def get_uti_type(flp) -> str:
         """
-        Get the Apple conform UTI Type from a flp instance which has been used on the data which should be sent 
+        Get the Apple conform UTI Type from a flp instance which has been used on the data which should be sent
 
-        :param flp: fleep object 
+        :param flp: fleep object
         """
 
         # Default UTI Type
@@ -132,8 +132,7 @@ class AirDropUtil:
                 cert = x509.X509(sign_cert_file.read())
                 key = pkey.PKey(privkey=key_file.read())
                 # possibly need to add intermediate certs
-                cms_signed = cms.SignedData.create(record_data_plist, cert=cert, pkey=key, certs=None,
-                                                   flags=cms.Flags.PARTIAL)
+                cms_signed = cms.SignedData.create(record_data_plist, cert=cert, pkey=key, certs=None, flags=cms.Flags.PARTIAL)
                 signed_data = AirDropUtil.pem2der(cms_signed.pem())
 
         return signed_data
@@ -141,7 +140,7 @@ class AirDropUtil:
     @staticmethod
     def pem2der(s):
         """
-        Create DER Formatted bytes from a PEM Base64 String 
+        Create DER Formatted bytes from a PEM Base64 String
 
         :param s: PEM formatted string
         """
@@ -153,10 +152,10 @@ class AirDropUtil:
     @staticmethod
     def generate_file_icon(file_path):
         """
-        Generates a small and a big thumbnail of an image 
+        Generates a small and a big thumbnail of an image
         This will make it possible to preview the sent file
 
-        :param file_path: The path to the image 
+        :param file_path: The path to the image
         """
         im = Image.open(file_path)
 
@@ -177,10 +176,10 @@ class AirDropUtil:
         file_icon = imgByteArr.getvalue()
 
         # Small image
-        #im.thumbnail((64, 64), Image.ANTIALIAS)
-        #imgByteArr = io.BytesIO()
-        #im.save(imgByteArr, format='JPEG2000')
-        #small_file_icon = imgByteArr.getvalue()
+        # im.thumbnail((64, 64), Image.ANTIALIAS)
+        # imgByteArr = io.BytesIO()
+        # im.save(imgByteArr, format='JPEG2000')
+        # small_file_icon = imgByteArr.getvalue()
 
         return file_icon
 
@@ -193,7 +192,6 @@ class AirDropUtil:
         :param bool ipv6: Boolean indicating if the ipv6 address should be retrieved
         :return: IPv4Address or IPv6Address object or None
         """
-
         def get_interface_by_name(name):
             for interface in ifaddr.get_adapters():
                 if interface.name == name:
@@ -241,7 +239,7 @@ class AbsArchiveWrite(ArchiveWrite):
         with new_archive_entry() as entry_p:
             entry = ArchiveEntry(None, entry_p)
             with new_archive_read_disk(path) as read_p:
-                while 1:
+                while True:
                     r = read_next_header2(read_p, entry_p)
                     if r == ARCHIVE_EOF:
                         break
@@ -250,7 +248,7 @@ class AbsArchiveWrite(ArchiveWrite):
                     write_header(write_p, entry_p)
                     try:
                         with open(entry_sourcepath(entry_p), 'rb') as f:
-                            while 1:
+                            while True:
                                 data = f.read(block_size)
                                 if not data:
                                     break

requirements-dev.txt

@@ -0,0 +1,3 @@
+flake8
+pytest
+yapf

setup.cfg

@@ -0,0 +1,6 @@
+[flake8]
+max-line-length = 127
+
+[yapf]
+based_on_style = pep8
+column_limit = 127

setup.py

@@ -32,11 +32,10 @@ setup(
     ],
     keywords='cli',
     packages=find_packages(exclude=['docs']),
-    package_data={
-        'opendrop': ['certs/*.pem']
-    },
-    install_requires=['requests', 'fleep', 'ifaddr', 'netifaces', 'Pillow',
-                      'requests_toolbelt', 'ctypescrypto', 'libarchive-c'],
+    package_data={'opendrop': ['certs/*.pem']},
+    install_requires=[
+        'Pillow', 'ctypescrypto', 'fleep', 'ifaddr', 'libarchive-c', 'requests', 'requests_toolbelt', 'zeroconf>=0.24.2'
+    ],
     entry_points={
         'console_scripts': [
             'opendrop=opendrop.cli:main',

tests/test_client.py

@@ -0,0 +1,19 @@
+from opendrop.client import AirDropBrowser
+from opendrop.config import AirDropConfig
+
+
+def get_loopback():
+    import ifaddr
+    for adapter in ifaddr.get_adapters():
+        if adapter.name.startswith('lo'):
+            return adapter.name
+    return None
+
+
+def test_browser_setup():
+    loopback = get_loopback()
+    assert loopback is not None, 'Could not find loopback interface'
+    config = AirDropConfig(interface=loopback)
+    browser = AirDropBrowser(config)
+    browser.start()
+    browser.stop()

tests/test_server.py

@@ -0,0 +1,20 @@
+from opendrop.server import AirDropServer
+from opendrop.config import AirDropConfig
+
+
+def get_loopback():
+    import ifaddr
+    for adapter in ifaddr.get_adapters():
+        if adapter.name.startswith('lo'):
+            return adapter.name
+    return None
+
+
+def test_server_setup():
+    loopback = get_loopback()
+    assert loopback is not None, 'Could not find loopback interface'
+    config = AirDropConfig(interface=loopback)
+    server = AirDropServer(config)
+    server.start_service()
+    # TODO currently no good way of stopping the server
+    # server.start_server()