Skip to content

Commit

Permalink
Merge branch 'master' of github.com:guardianproject/orbot
Browse files Browse the repository at this point in the history
  • Loading branch information
n8fr8 committed May 22, 2024

Verified

This commit was signed with the committer’s verified signature.
frapell Franco Pellegrini
2 parents 09dd97e + b3e2875 commit 0140ae6
Showing 400 changed files with 6,804 additions and 4,043 deletions.
63 changes: 14 additions & 49 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,11 @@
# compiled NDK binary artifacts
orbotservice/src/main/libs/
OrbotLib/OrbotIPtProxy

# auto-generated files from Android builds
build.xml
ant.properties
default.properties
proguard.cfg
proguard-project.txt
#
releases
.directory
keystore.properties

#built application files
# Built application files
*.apk
*.ap_

# files for the dex VM
*.dex
*.aab

# Java class files
*.class

# subdirs for generated files
bin/
gen/

# Local configuration file (sdk path, etc)
local.properties

@@ -38,37 +17,23 @@ Thumbs.db

# Android Studio
*.iml
.idea/
.gradle/
.idea
.gradle
/build
build/
captures/

/external/appcompat/bin/
/external/appcompat/gen/
/external/bin/
/external/include/
/external/*-build-stamp
/external/lib/
/external/privoxy/
/external/test.c
/external/test.h.gch
/external/translation/
bin
gen
native
libs/jtorctl.jar
builds
external/patches/*
obj
# NDK
obj/
.cxx
.externalNativeBuild

# Orbot libs
libs/jtorctl.jar
app/src/main/jniLibs/
app/src/main/libs/
#orbotservice/src/main/libs/
#orbotservice/src/main/jniLibs/
#orbotservice/src/main/assets/armeabi/
#orbotservice/src/main/assets/x86/

# emacs
*~
orbotservice/src/main/libs/
OrbotLib/OrbotIPtProxy

# Fastlane
/fastlane/report.xml
195 changes: 100 additions & 95 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
This file contains the license for Orbot, a free software project to
provide anonymity on the Internet from a Google Android device.

It also lists the licenses for other components used by Orbot, including
Tor, and iptables.
It also lists the licenses for other components used by Orbot, including
Tor.

For more information about Orbot, see https://orbot.app/

If you got this file as a part of a larger bundle, there may be other
license terms that you should be aware of.
===============================================================================

============================================================

Orbot is distributed under this license (aka the 3-clause BSD license)

Copyright (c) 2009-2010, Nathan Freitas, The Guardian Project
@@ -29,65 +31,69 @@ distribution.
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*****

===============================================================================
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

============================================================

Orbot includes the Obfs4 pluggable transport:
https://gitweb.torproject.org/pluggable-transports/obfs4.git

Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
===============================================================================


*****
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

============================================================

Orbot contains a binary distribution of Tor:

This file contains the license for Tor,
a free software project to provide anonymity on the Internet.
This file contains the license for Tor,
a free software project to provide anonymity on the Internet.

It also lists the licenses for other components used by Tor.
It also lists the licenses for other components used by Tor.

For more information about Tor, see https://www.torproject.org/.
For more information about Tor, see https://www.torproject.org/.

If you got this file as a part of a larger bundle,
there may be other license terms that you should be aware of.
If you got this file as a part of a larger bundle, there may be
other license terms that you should be aware of.

============================================================

===============================================================================
Tor is distributed under this license:

Copyright (c) 2001-2004, Roger Dingledine
@@ -110,21 +116,24 @@ distribution.
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================

src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
under the following license:
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

============================================================

src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are
licensed under the following license:

* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
@@ -135,42 +144,38 @@ under the following license:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. The name of the author may not be used to endorse or promote
* products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

===============================================================================
If you got Tor as a static binary with OpenSSL included, then you should know:
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
* WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.

============================================================

If you got Tor as a static binary with OpenSSL included, then you should
know:

"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
===============================================================================

===============================================================================
============================================================

"This program uses the IP-to-Country Database provided by
WebHosting.Info (http://www.webhosting.info), available from
http://ip-to-country.webhosting.info."
See the src/config/geoip file in particular.
===============================================================================

===============================================================================
Orbot also uses iptables from the Netfilter.org project

netfilter/iptables is - like all of the Linux Kernel - Free Software (sometimes
referred to as Open Source Software), distributed under the terms of the GNU GPLv2
only. Please, note that some source code files might differ, and in that case it
is explicitely stated in the header of every file.

The GPL also contains some obligations. If you distribute netfilter/iptables code
in binary form, you have to offer the source code, too.
1 change: 1 addition & 0 deletions OrbotLib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OrbotLib-Sources.jar
Binary file removed OrbotLib/OrbotLib-sources.jar
Binary file not shown.
Binary file modified OrbotLib/OrbotLib.aar
Binary file not shown.
6 changes: 2 additions & 4 deletions OrbotLib/build-orbotlib.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#!/bin/sh

rm *aar *jar -v
rm -v *aar *jar
if [ ! -d OrbotIPtProxy ]; then
git clone https://github.com/guardianproject/OrbotIPtProxy
git clone https://github.com/bitmold/OrbotIPtProxy
fi
cd OrbotIPtProxy
git fetch
git rebase
bash build-orbot.sh
mv OrbotLib.aar .. -v
mv OrbotLib-sources.jar .. -v
cd ..
24 changes: 16 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -8,15 +8,16 @@

[![Weblate Status](./docs/badges/translate_weblate.svg)](https://hosted.weblate.org/engage/guardianproject/)
[![Play Downloads](./docs/badges/downloads_gplay.svg)](https://play.google.com/store/apps/details?id=org.torproject.android)
[![Bitrise Status](./docs/badges/bitrise_workflow.svg)](https://app.bitrise.io/app/0e76c31b8e7e1801) ([CI docs](./docs/CI.md))
[![Bitrise Status](./docs/badges/bitrise_workflow.svg)](https://app.bitrise.io/app/0e76c31b8e7e1801) ([CI docs](./docs/info/CI.md))

Orbot is a freely licensed open-source application developed for the
Android platform. It acts as a front-end for the Tor binary application,
while also providing a secure HTTP Proxy for connecting web browsers and other
HTTP client applications into the Tor SOCKS interface.

***********************************************
<img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2018-01.png width="24%"> <img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2018-02.png width="24%"> <img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2018-03.png width="24%"> <img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2018-05.png width="24%">
<img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2024-01.png width="24%"> <img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2024-02.png width="24%">
<img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2024-03.png width="24%"> <img src=./fastlane/metadata/android/en-US/images/phoneScreenshots/device-2024-04.png width="24%">

***********************************************
Orbot is a crucial component of the Guardian Project, an initiative that leads an effort
@@ -30,13 +31,20 @@ is reasonably secure, but please ensure you read the usage instructions and
learn to configure it properly. Learn more: https://torproject.org/

***********************************************

<div align="center">
- Download Orbot:
https://github.com/guardianproject/orbot/releases/latest <br>
- Tor FAQ (Frequently Asked Questions):
https://support.torproject.org/faq/ <br>
- Contribute Translations:
https://hosted.weblate.org/engage/guardianproject/ <br>
<table>
<tr>
<td><a href="https://github.com/guardianproject/orbot/releases/latest">Download the Latest Orbot Release</a></td>
</tr>
<tr>
<td><a href="https://support.torproject.org/faq/">Tor FAQ (Frequently Asked Questions)</a></td>
</tr>
<tr>
<td><a href="https://hosted.weblate.org/engage/guardianproject/">Please Contribute Your Translations</a></td>
</tr>
</table>
</div>

***********************************************
**Copyright &#169; 2009-2023, Nathan Freitas, The Guardian Project**
Loading

0 comments on commit 0140ae6

Please sign in to comment.