Commit Graph

7243 Commits

Author SHA1 Message Date
Jason Rhinelander
a7decd5ec3
Silence warnings 2021-09-02 14:17:10 -04:00
Jason Rhinelander
e11efe9bc5
Reformat 2021-09-02 14:17:10 -04:00
Jason Rhinelander
9dd604820f
Unleak exit mode DNS via unbound DNS trampoline on (macOS)
When we enable/disable exit mode on this restarts the unbound DNS
responder with the DNS trampoline (or restores upstream, when disabling)
to properly route DNS requests through the tunnel (because libunbound's
direct requests don't get tunneled because unbound is inside the network
extension).
2021-09-02 14:17:10 -04:00
Jason Rhinelander
0f097450d7
Remove debug 2021-09-02 14:17:10 -04:00
Jason Rhinelander
f00e78c1a3
Add DNS trampoline
This runs a DNS listener on localhost:1053 that bounces requests to the
upstream DNS through the tunnel.  The idea here is that, when we turn on
exit mode, we start libunbound bouncing the requests through the
trampoline (since if it makes direct requests they won't go through the
tunnel).

(The actual libunbound configuration is still to follow).
2021-09-02 14:17:10 -04:00
Jason Rhinelander
fd759914b6
Remove unused vars 2021-09-02 14:17:10 -04:00
Jason Rhinelander
e84390748d
Add RouteManager; make exit on/off work 2021-09-02 14:17:10 -04:00
Jason Rhinelander
c74dcba463
Add lokinet subnet to default routes
Mac doesn't route to a tunnel's ip range by default.  WTF.
2021-09-02 14:17:10 -04:00
Jason Rhinelander
9afa95cd7a
Remove unused/empty/no longer used apple headers 2021-09-02 14:17:10 -04:00
Jason Rhinelander
3527c9cdb5
Remove more unused dns-proxy files 2021-09-02 14:17:10 -04:00
Jason Rhinelander
58da228f62
Generate a default client lokinet.ini on startup if it doesn't exist
Thus when a user goes looking for it they'll find the (commented out)
default in the right place and can edit it.

(That right place is: ~/Library/Containers/com.loki-project.lokinet.network-extension/Data/lokinet.ini)
2021-09-02 14:17:09 -04:00
Jason Rhinelander
fec3598e16
Remove no-longer-used framework.mm 2021-09-02 14:17:09 -04:00
Jason Rhinelander
e39c473c88
format.sh: support macports clang-format
macports names it clang-format-mp-N to avoid clashing with a
system-installed one.
2021-09-02 14:17:09 -04:00
Jason Rhinelander
2964051f0d
Remove swift version (do not squash)
Don't squash this commit so that the swift version stays around in
history in case we need to resurrect it again some day (i.e. when Apple
decides to kill off Objective-C support).
2021-09-02 14:17:09 -04:00
Jason Rhinelander
329da951b7
Apple OS interface cleanup & refactoring
- Add a C callback interface (context_wrapper.h) between lokinet and the
  objective-C code so that:
  - we can use objective-C (rather than objective-C++), which seems more
    likely to be supported by Apple into the future;
  - we minimize the amount of code that needs to be aware of the Apple
    APIs.
  - this replaces apple logger objective c++ implementation with a plain
    c++ implementation that takes a very simple C callback (provided
    from the obj-c code) to actually make the call to NSLog.

- Add various documentation to the code of what is going on.

- Send all DNS traffic to the primary IP on the tun interface.  The
  match prefixes simply don't work as advertised, and have weird shit
  (like even if you get it working for some domains, "instagram.com"
  still doesn't because of god-knows-what Apple internal politics).

- Drop the dns proxy code as we don't need it anymore.

- Don't use 9.9.9.9 for default DNS.  (We might consider the unfiltered
  9.9.9.10 as an alternative default, but if we do it should be a global
  lokinet change rather than a Mac-specific change).

- Parse a lokinet.ini in the data directory, if it exists.  (Since we
  are sandboxed, it is an app-specific "home" directory so is probably
  buried god knows where, but at least the GUI ought to be able to get
  it to let users add things to it).

- This commit also adds a swift version of the PacketTunnelProvider
  glue, which ought to work in theory, but the *tooling* for cmake is so
  underdeveloped that I couldn't find any way to actually get the damn
  thing working.  So I'm committing it here anyway (and will revert it
  away in the next commit) in case we someday want to switch to it.

-
2021-09-02 14:17:09 -04:00
Jason Rhinelander
712b5a5608
Tweak icns generation to only run when necessary 2021-09-02 14:17:09 -04:00
Jason Rhinelander
3f0b34e860
Consolidate apple-specific bits into llarp/apple 2021-09-02 14:17:09 -04:00
jeff
deb0a982be
it works 2021-09-02 14:17:09 -04:00
jeff
1272a4fbe1
add dummy sign target for ci when we don't have signing keys
remove static macos from ci pipeline
2021-09-02 14:17:09 -04:00
jeff
d24221e67a
make ci run ./contrib/mac.sh with no codesigning 2021-09-02 14:17:09 -04:00
jeff
7db2459469
macos sort of works now 2021-09-02 14:17:09 -04:00
Jason Rhinelander
81d27c35c1
Default CODESIGN_APPEX to CODESIGN_APP
Sometimes (e.g. dev builds) these can apparently be the same; sometimes
it seems they need to be different, because Apple.
2021-09-02 14:17:08 -04:00
Jason Rhinelander
3ab117a03b
Switch extension from a framework to an appex 2021-09-02 14:17:08 -04:00
Jason Rhinelander
faf8a699a6
Set version into Info.plist, don't manually configure
cmake already treats the info plist as a file to be configured (not
merely copied) so we don't need to configure_file ourselves to a temp
file.
2021-09-02 14:17:08 -04:00
Jason Rhinelander
0bb00baacf
Various cmake build cleanups/refactors
- Added contrib/macos/README.txt with description of the cancer
  happening here.
- Add provisioningprofiles that Apple wants to make things work properly
- Made the entitlements files match the provisioningprofiles
- Remove configured entitlements files; we *can't* change any of the
  things here because they are closedly tied to the provisioningprofiles
  -- which means if someone wants to build their own Lokinet, they have
  to replace a bunch of crap and change application IDs throughout.
  This is the hostile-to-open-source Apple way.
- Remove unused old lokinet binary, as we're no longer using it on macos
- Use a POST_BUILD rather than install to copy things around into the
  right places
- Convert all the configure_file's to consistently use @ONLY
- Misc cleanups
2021-09-02 14:17:08 -04:00
jeff
5edd045c9b
add swift version bullshit file and additional bullshittery 2021-09-02 14:17:08 -04:00
jeff
0708a0d897
initial network extension code for macos
probably does not work
2021-09-02 14:17:08 -04:00
Jeff Becker
63ed5c16ed
upload bare apk as ci artifact 2021-09-02 13:11:29 -04:00
Jeff Becker
92cfa8a558
dont bundle raw jni libs 2021-09-02 13:05:16 -04:00
Jeff Becker
c39225b3b9
correct lokinet flutter url 2021-09-02 12:03:04 -04:00
Jeff Becker
f65ec8e79f
make ci try building the flutter apk in the android apk pipeline 2021-09-02 12:01:36 -04:00
Jason Rhinelander
f3bc00bcd8
Merge pull request #1724 from majestrate/update-static-deps-2021-08-31
bump openssl static deps version for upstream security update
2021-09-01 17:30:51 -03:00
Jeff
3bcc8f99c0
Merge pull request #1726 from majestrate/dns-graceful-teardown-2021-09-01
dns refactor
2021-09-01 16:23:27 -04:00
Jeff
060c571060
Merge pull request #1727 from majestrate/android-hang-fix-2021-09-01
dont save addrmap on android as it hangs
2021-09-01 16:23:17 -04:00
Jeff
cd99e5c4f4
Merge pull request #1729 from jagerman/fix-omq-deprecation
Stop using deprecated OMQ connect_remote overload
2021-09-01 16:19:35 -04:00
Jason Rhinelander
a8a7ef5461 Stop using deprecated OMQ connect_remote overload 2021-09-01 15:40:25 -03:00
Jeff
0447ffc829
Merge pull request #1728 from jagerman/fix-arg-order-v2
Unbound callbacks also need arguments reversed
2021-09-01 14:19:05 -04:00
Jason Rhinelander
14c93e2b93 Unbound callbacks also need arguments reversed
PR #1725 reversed argument orders but UnboundResolver was still using
(from,to) ordering in its callbacks, which leaked through to make a
wrong order in our reply function (which simply forwards arguments).

This fixes that bug by making UnboundResolver callback argument order
consistent (i.e. using to, from) with the PacketHandler argument order.
2021-09-01 14:40:18 -03:00
Jeff Becker
0c1a3e19bd
redo dns to use event loop on non windows and threading bullshit on windows 2021-09-01 13:08:37 -04:00
Jeff Becker
a4a9062f12
dont save addrmap on android as it hangs 2021-09-01 12:07:10 -04:00
Jeff
c0b8c87f81
Merge pull request #1725 from jagerman/dnsinterceptor-arg-reverse
Reapply "fix dns on android" + fix argument order
2021-09-01 11:58:02 -04:00
Jason Rhinelander
3ce329d2bf Reapply "fix dns on android" + fix argument order
The reason the dns fix on android didn't work is that the DnsInterceptor
had a reversed to/from argument order for its
`SendServerMessageBufferTo` overload, and so android/mac needed the
to/from to be reversed so that the second reverse cancelled out the
first one.

Upon review, the DnsInterceptor order (to, from) is more intuitive than
the base order (from, to), so this reapplies the dns fix and swaps
everything *except* DnsInterceptor to match the (to, from) argument
order.
2021-09-01 12:09:27 -03:00
Jason Rhinelander
a70035b7ec
Revert "fix dns on android"
This reverts commit dace0224ec.

This reportedly didn't fix things on Android, and most definitely breaks
macOS (with this we get a bunch of errors about expecting inbound when
we have outbound).
2021-08-31 18:58:03 -04:00
Jeff
418eb4efaa
Merge pull request #1721 from majestrate/platform-bits-2021-08-26
initial routing table platform bits refactor
2021-08-31 12:10:32 -04:00
Jeff Becker
439183bf19
bump openssl static deps version for upstream security update 2021-08-31 12:05:01 -04:00
Jeff
2e52908510
Merge pull request #1722 from jagerman/sockaddr-optimization
SockAddr string optimization
2021-08-31 09:11:34 -04:00
Jason Rhinelander
3deb55193f SockAddr string optimization
- Reduce buffer size to INET6_ADDRSTRLEN, and use a single buf rather
  than two identical ones in each branch.
- Don't pre-reserve because doing so is usually going to over-allocate,
  but also because it prevents SSO, especially for the IPv4 case which
  should fit in SSO for all IPv4 addresses.
2021-08-30 16:55:17 -03:00
Jeff Becker
6251c13d46
add NOP implementation of VPN route manager for android 2021-08-27 19:49:01 -04:00
Jeff Becker
07a58ffa6c
use vpn::NetworkInterface for add/del route via interface instead of string 2021-08-27 11:55:57 -04:00
Jeff Becker
c9b9ed91c2
make add/del blackhole default to empty implementation 2021-08-27 11:42:24 -04:00