f9adc4
diff -up firefox-68.0/config/makefiles/rust.mk.rust-network-check firefox-68.0/config/makefiles/rust.mk
f9adc4
--- firefox-68.0/config/makefiles/rust.mk.rust-network-check	2019-06-06 10:29:18.984737603 +0200
f9adc4
+++ firefox-68.0/config/makefiles/rust.mk	2019-06-06 11:39:51.581028835 +0200
f9adc4
@@ -127,7 +127,7 @@ export RUST_BACKTRACE=full
f9adc4
 export MOZ_TOPOBJDIR=$(topobjdir)
f9adc4
 
f9adc4
 target_rust_ltoable := force-cargo-library-build
f9adc4
-target_rust_nonltoable := force-cargo-test-run force-cargo-library-check $(foreach b,build check,force-cargo-program-$(b))
f9adc4
+target_rust_nonltoable := force-cargo-test-run $(foreach b,build check,force-cargo-program-$(b))
f9adc4
 
f9adc4
 $(target_rust_ltoable): RUSTFLAGS:=$(rustflags_override) $(RUSTFLAGS) $(if $(MOZ_LTO_RUST),-Clinker-plugin-lto)
f9adc4
 $(target_rust_nonltoable): RUSTFLAGS:=$(rustflags_override) $(RUSTFLAGS)
f9adc4
@@ -238,19 +238,9 @@ force-cargo-library-build:
f9adc4
 	$(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags)
f9adc4
 
f9adc4
 $(RUST_LIBRARY_FILE): force-cargo-library-build
f9adc4
-# When we are building in --enable-release mode; we add an additional check to confirm
f9adc4
-# that we are not importing any networking-related functions in rust code. This reduces
f9adc4
-# the chance of proxy bypasses originating from rust code.
f9adc4
-ifndef DEVELOPER_OPTIONS
f9adc4
-ifndef MOZ_DEBUG_RUST
f9adc4
-ifeq ($(OS_ARCH), Linux)
f9adc4
-	$(call py_action,check_binary,--target --networking $@)
f9adc4
-endif
f9adc4
-endif
f9adc4
-endif
f9adc4
 
f9adc4
 force-cargo-library-check:
f9adc4
-	$(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
f9adc4
+	@true
f9adc4
 else
f9adc4
 force-cargo-library-check:
f9adc4
 	@true
f9adc4
diff -up firefox-68.0/python/mozbuild/mozbuild/action/check_binary.py.rust-network-check firefox-68.0/python/mozbuild/mozbuild/action/check_binary.py
f9adc4
--- firefox-68.0/python/mozbuild/mozbuild/action/check_binary.py.rust-network-check	2019-05-20 18:17:57.000000000 +0200
f9adc4
+++ firefox-68.0/python/mozbuild/mozbuild/action/check_binary.py	2019-06-06 10:29:18.986737599 +0200
f9adc4
@@ -250,43 +250,6 @@ def check_mozglue_order(target, binary):
f9adc4
         raise RuntimeError('Could not parse readelf output?')
f9adc4
 
f9adc4
 
f9adc4
-def check_networking(binary):
f9adc4
-    retcode = 0
f9adc4
-    networking_functions = set([
f9adc4
-        # socketpair is not concerning; it is restricted to AF_UNIX
f9adc4
-        "socket", "connect", "accept", "bind", "listen",
f9adc4
-        "getsockname", "getsockopt", "setsockopt",
f9adc4
-        "recv", "recvfrom",
f9adc4
-        "send", "sendto",
f9adc4
-        # We would be concerned by recvmsg and sendmsg; but we believe
f9adc4
-        # they are okay as documented in 1376621#c23
f9adc4
-        "gethostbyname", "gethostbyaddr", "gethostent", "sethostent", "endhostent",
f9adc4
-        "gethostent_r", "gethostbyname2", "gethostbyaddr_r", "gethostbyname_r",
f9adc4
-        "gethostbyname2_r",
f9adc4
-        "getaddrinfo", "getservent", "getservbyname", "getservbyport", "setservent",
f9adc4
-        "getprotoent", "getprotobyname", "getprotobynumber", "setprotoent",
f9adc4
-        "endprotoent"])
f9adc4
-    bad_occurences_names = set()
f9adc4
-
f9adc4
-    try:
f9adc4
-        for sym in at_least_one(iter_symbols(binary)):
f9adc4
-            if sym['addr'] == 0 and sym['name'] in networking_functions:
f9adc4
-                bad_occurences_names.add(sym['name'])
f9adc4
-    except Empty:
f9adc4
-        raise RuntimeError('Could not parse llvm-objdump output?')
f9adc4
-
f9adc4
-    basename = os.path.basename(binary)
f9adc4
-    if bad_occurences_names:
f9adc4
-        s = 'TEST-UNEXPECTED-FAIL | check_networking | {} | Identified {} ' + \
f9adc4
-            'networking function(s) being imported in the rust static library ({})'
f9adc4
-        print(s.format(basename, len(bad_occurences_names),
f9adc4
-            ",".join(sorted(bad_occurences_names))),
f9adc4
-            file=sys.stderr)
f9adc4
-        retcode = 1
f9adc4
-    elif buildconfig.substs.get('MOZ_AUTOMATION'):
f9adc4
-        print('TEST-PASS | check_networking | {}'.format(basename))
f9adc4
-    return retcode
f9adc4
-
f9adc4
 def checks(target, binary):
f9adc4
     # The clang-plugin is built as target but is really a host binary.
f9adc4
     # Cheat and pretend we were passed the right argument.
f9adc4
@@ -330,8 +293,6 @@ def main(args):
f9adc4
                         help='Perform checks for a host binary')
f9adc4
     parser.add_argument('--target', action='store_true',
f9adc4
                         help='Perform checks for a target binary')
f9adc4
-    parser.add_argument('--networking', action='store_true',
f9adc4
-                        help='Perform checks for networking functions')
f9adc4
 
f9adc4
     parser.add_argument('binary', metavar='PATH',
f9adc4
                         help='Location of the binary to check')
f9adc4
@@ -343,14 +304,7 @@ def main(args):
f9adc4
               file=sys.stderr)
f9adc4
         return 1
f9adc4
 
f9adc4
-    if options.networking and options.host:
f9adc4
-        print('--networking is only valid with --target',
f9adc4
-               file=sys.stderr)
f9adc4
-        return 1
f9adc4
-
f9adc4
-    if options.networking:
f9adc4
-        return check_networking(options.binary)
f9adc4
-    elif options.host:
f9adc4
+    if options.host:
f9adc4
         return checks(HOST, options.binary)
f9adc4
     elif options.target:
f9adc4
         return checks(TARGET, options.binary)