dropbear: add extra build customization options
PATCH 1/1 dropbear: add extra build customization options
Adds:
- Option to build client (defaults y, for compatibility)
- Option to disable password authentication,
to only allow public key authentication instead
- Option to disable TCP forwarding.
Defaults to y, as most legitimate users are not using it, and the feature is very popular with spammers that scan for devices with weak passwords and use them to relay spam.
--- package/dropbear/Config.in | 21 +++++++++++++++++++++ package/dropbear/dropbear.mk | 31 ++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 3 deletions(-)
package/dropbear/Config.in +21 -0
@@ -8,6 +8,12 @@ config BR2_PACKAGE_DROPBEAR if BR2_PACKAGE_DROPBEAR +config BR2_PACKAGE_DROPBEAR_CLIENT + bool "client programs" + default y + help + Provides dbclient, ssh + config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS bool "disable reverse DNS lookups" help
@@ -15,6 +21,21 @@ config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS on systems without working DNS, as connections otherwise stall until DNS times out. +config BR2_PACKAGE_DROPBEAR_DISABLE_PASSWORD_AUTH + bool "disable password authentication" + help + Disable password authentication. Typically used when security + requirements demand that only public key authentication is allowed. + +config BR2_PACKAGE_DROPBEAR_DISABLE_TCP_FORWARDING + bool "disable TCP forwarding" + default y + help + Disable TCP forwarding. SSH allows tunneling TCP connections, + if you do not need that, it is better to disable it. + Spammers are known to scan for accounts with weak passwords + and abuse this functionality as easy cross-platform way to relay spam. + config BR2_PACKAGE_DROPBEAR_SMALL bool "optimize for size" default y
package/dropbear/dropbear.mk +28 -3
@@ -7,12 +7,18 @@ DROPBEAR_VERSION = 2014.65 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 +DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c +DROPBEAR_LICENSE_FILES = LICENSE + +ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" - -DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c -DROPBEAR_LICENSE_FILES = LICENSE +else +DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp +DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ + PROGRAMS="dropbear dropbearkey dropbearconvert scp" +endif ifeq ($(BR2_PREFER_STATIC_LIB),y) DROPBEAR_MAKE += STATIC=1
@@ -28,6 +34,17 @@ define DROPBEAR_ENABLE_REVERSE_DNS $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h endef +define DROPBEAR_DISABLE_PASSWORD_AUTH + $(SED) 's:\(#define ENABLE_SVR_PASSWORD_AUTH\).*:/*\1 */:' $(@D)/options.h +endef + +define DROPBEAR_DISABLE_TCP_FORWARDING + $(SED) 's:\(#define ENABLE_CLI_LOCALTCPFWD\).*:/*\1 */:' $(@D)/options.h + $(SED) 's:\(#define ENABLE_CLI_REMOTETCPFWD\).*:/*\1 */:' $(@D)/options.h + $(SED) 's:\(#define ENABLE_SVR_LOCALTCPFWD\).*:/*\1 */:' $(@D)/options.h + $(SED) 's:\(#define ENABLE_SVR_REMOTETCPFWD\).*:/*\1 */:' $(@D)/options.h +endef + define DROPBEAR_BUILD_SMALL $(SED) 's:.*\(#define DROPBEAR_SMALL_CODE\).*:\1:' $(@D)/options.h $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
@@ -64,6 +81,14 @@ ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS endif +ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_TCP_FORWARDING),y) +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_TCP_FORWARDING +endif + +ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_PASSWORD_AUTH),y) +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_PASSWORD_AUTH +endif + ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL DROPBEAR_CONF_OPT += --disable-zlib
Signature · 1 line
1.8.3.2
PATCH 1/1 sqlite: add option to disable fsync
For use-cases in which performance is more important than data integrity.
--- package/sqlite/Config.in | 8 ++++++++ package/sqlite/sqlite.mk | 4 ++++ 2 files changed, 12 insertions(+)
package/sqlite/Config.in +8 -0
@@ -53,4 +53,12 @@ config BR2_PACKAGE_SQLITE_SECURE_DELETE http://www.sqlite.org/pragma.html#pragma_secure_delete for additional information. +config BR2_PACKAGE_SQLITE_NO_SYNC + bool "Disable fsync" + help + By default SQLite forces all database transactions to storage + immediately using fsync() to protect against data loss in case + of power failure. + This option turns this behavior off resulting in higher performance + especially when using slow flash storage. endif
package/sqlite/sqlite.mk +4 -0
@@ -33,6 +33,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_SECURE_DELETE),y) SQLITE_CFLAGS += -DSQLITE_SECURE_DELETE endif +ifeq ($(BR2_PACKAGE_SQLITE_NO_SYNC),y) +SQLITE_CFLAGS += -DSQLITE_NO_SYNC +endif + SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" SQLITE_CONF_OPT = \
Signature · 1 line
1.8.3.2
PATCH 1/1 sqlite: add option to disable fsync
Dear Floris Bos,
Quoted 7 lines · Floris Bos
For use-cases in which performance is more important than data integrity.
Signed-off-by Floris Bos <[email protected]>--- package/sqlite/Config.in | 8 ++++++++ package/sqlite/sqlite.mk | 4 ++++ 2 files changed, 12 insertions(+)
Only one small nitpick below, which can probably be fixed when Peter applies the patch.
Quoted 8 lines
package/sqlite/Config.in +0
-0@@ -53,4 +53,12 @@ config BR2_PACKAGE_SQLITE_SECURE_DELETE http://www.sqlite.org/pragma.html#pragma_secure_delete for additional information.
package/sqlite/Config.in config BR2_PACKAGE_SQLITE_SECURE_DELETE · line 64
Quoted 10 lines
package/sqlite/Config.in +8
-0+config BR2_PACKAGE_SQLITE_NO_SYNC + bool "Disable fsync" + help + By default SQLite forces all database transactions to storage + immediately using fsync() to protect against data loss in case + of power failure. + This option turns this behavior off resulting in higher performance + especially when using slow flash storage. endif
Missing new line before "endif".
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 sqlite: add option to disable fsync
In reply to Floris BosQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Floris" == Floris Bos <[email protected]> writes:
For use-cases in which performance is more important than data integrity.
Signed-off-by Floris Bos <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 dropbear: add extra build customization options
In reply to Floris BosDear Floris Bos,
Quoted 2 lines · Floris Bos
- Option to disable password authentication,
to only allow public key authentication instead
This can be done at runtime using the -s option, and presumably disabling it at build time doesn't give much space savings, so we'd rather not have a Config.in option for this.
Quoted 4 lines
- Option to disable TCP forwarding.
Defaults to y, as most legitimate users are not using it, and the feature is very popular with spammers that scan for devices with weak passwords and use them to relay spam.
This can be done at runtime using the -j and -k options, so same logic as for the password authentication disabling.
We'd however be open to merge the option to install or not the clients, but we do have some comments/questions below.
package/dropbear/dropbear.mk line 21
Quoted 12 lines
package/dropbear/dropbear.mk +6
-3+ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" - -DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c -DROPBEAR_LICENSE_FILES = LICENSE +else +DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp +DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ + PROGRAMS="dropbear dropbearkey dropbearconvert scp" +endif
Why is scp part of the server-only installation?
Also, can you make this a bit smarter to avoid duplication. For example:
DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y)DROPBEAR_TARGET_BINS += ssh dbclient
endif
And then use:
PROGRAMS="dropbear $(DROPBEAR_TARGET_BINS)"
When doing the $(MAKE) call.
We'll mark your patch as 'Changes Requested' in patchwork, so can you resend an updated version that takes into account those comments?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 dropbear: add extra build customization options
Hi,
Quoted 8 lines · Thomas Petazzoni
Quoted 2 lines · Floris Bos
- Option to disable password authentication, to only allow public key authentication instead
This can be done at runtime using the -s option, and presumably disabling it at build time doesn't give much space savings, so we'd rather not have a Config.in option for this.
Quoted 6 lines
Quoted 4 lines
- Option to disable TCP forwarding.
Defaults to y, as most legitimate users are not using it, and the feature is very popular with spammers that scan for devices with weak passwords and use them to relay spam.This can be done at runtime using the -j and -k options, so same logic as for the password authentication disabling.
Fair enough
Quoted 4 lines
We'd however be open to merge the option to install or not the clients, but we do have some comments/questions below.
Quoted 13 lines
package/dropbear/dropbear.mk line 21
Quoted 12 lines
package/dropbear/dropbear.mk +6
-3+ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" - -DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c -DROPBEAR_LICENSE_FILES = LICENSE +else +DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp +DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ + PROGRAMS="dropbear dropbearkey dropbearconvert scp" +endifWhy is scp part of the server-only installation?
Because scp is both a client and server program, similar to other programs that can tunnel data over SSH like rsync.
When using scp on the client, it simply calls the ssh client program to connect to the SSH server and executes scp server-side there with a flag to tell it to play server and read further instructions/data from stdin, send data to stdout.
Do could make building scp a seperate Config.in option.
Yours sincerely,
Floris Bos
PATCH 1/1 dropbear: add extra build customization options
Dear Floris Bos,
Quoted 17 lines · Floris Bos
Quoted 16 lines
We'd however be open to merge the option to install or not the clients, but we do have some comments/questions below.
package/dropbear/dropbear.mk line 21
Quoted 12 lines
package/dropbear/dropbear.mk +6
-3+ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" - -DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c -DROPBEAR_LICENSE_FILES = LICENSE +else +DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp +DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ + PROGRAMS="dropbear dropbearkey dropbearconvert scp" +endifWhy is scp part of the server-only installation?
Quoted 6 lines
Because scp is both a client and server program, similar to other programs that can tunnel data over SSH like rsync.
When using scp on the client, it simply calls the ssh client program to connect to the SSH server and executes scp server-side there with a flag to tell it to play server and read further instructions/data from stdin, send data to stdout.
Ah, ok. Can you indicate that in the commit log, or maybe better, as a comment in the code above the place where we defined what gets built for the server-only case vs. server+client case?
Quoted 1 line
Do could make building scp a seperate Config.in option.
I don't think that's needed.
So, can you cook an updated patch?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 dropbear: add extra build customization options
In reply to Thomas PetazzoniQuoted 8 lines · Thomas Petazzoni
Also, can you make this a bit smarter to avoid duplication. For example:
DROPBEAR_TARGET_BINS= dropbearkey dropbearconvert scpifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y)
DROPBEAR_TARGET_BINS+= ssh dbclient
endif
Quoted 5 lines
And then use:
PROGRAMS="dropbear $(DROPBEAR_TARGET_BINS)"When doing the $(MAKE) call.
Just remembered what was up with that.
Dropbear's SSH client is called dbclient.
The extra "ssh" convenience symlink is something non-standard the buildroot package made up.
One cannot pass a $(DROPBEAR_TARGET_BINS) containing "ssh" to the $(MAKE) call, as upstream dropbear has no clue how to make "ssh"
Yours sincerely,
Floris Bos
PATCH 1/1 dropbear: add extra build customization options
Dear Floris Bos,
Quoted 5 lines · Floris Bos
Dropbear's SSH client is called dbclient.
The extra "ssh" convenience symlink is something non-standard the buildroot package made up.
One cannot pass a $(DROPBEAR_TARGET_BINS) containing "ssh" to the $(MAKE) call, as upstream dropbear has no clue how to make "ssh"
Ok, but then you can still have two separate variables for the TARGET_BINS and the PROGRAMS, but not have duplication between the server+client, and server only cases.
Or even:
DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y)DROPBEAR_TARGET_BINS += dbclient ssh
endif
...
# Here some comment to explain why we filter out ssh $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS=$(filter-out ssh,$(DROPBEAR_TARGET_BINS))
...
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com