You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2019/04/10 04:51:41 UTC
[guacamole-server] branch staging/1.1.0 updated (3989c40 -> dd4c396)
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a change to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git.
from 3989c40 GUACAMOLE-694: Merge addition of "ca-certificates" dependency for Docker image.
add f6953e1 GUACAMOLE-637: Use proper namespaced path for Guacamole headers within libguac source.
add d7909a7 GUACAMOLE-637: Add strlcpy() implementation. Use libc strlcpy() if available.
add a78f254 GUACAMOLE-637: Add strlcat() implementation. Use libc strlcat() if available.
add 5bf6a14 GUACAMOLE-637: Add convenience function for joining an array of strings using a given delimiter.
add e5c1147 GUACAMOLE-637: Replace usages of strncpy() with guac_strlcpy().
add 3549da0 GUACAMOLE-637: Replace usages of strncat() with guac_strlcat().
add fdd3292 GUACAMOLE-637: Simplify path translation logic. Update to use guac_strl*(). Fix return values.
add dec3642 GUACAMOLE-637: Add unit tests for guac_strlcpy().
add 068f33a GUACAMOLE-637: Add unit tests for guac_strlcat().
add 258946c GUACAMOLE-637: Correctly handle string lengths as size_t (unsigned).
add e6c5da3 GUACAMOLE-637: Add unit tests for guac_strljoin().
add 7da837b GUACAMOLE-637: The __BSD_VISIBLE macro is required for strlcpy() and strlcat() to be available in libc's string.h.
add 789e388 GUACAMOLE-637: Not all systems place Perl in /usr/bin. The line `#!/usr/bin/env perl` should be used for portability.
add b7761e9 GUACAMOLE-637: The `$^` variable is non-portable and specific to GNU Make. As otherwise POSIX-compliant platforms may not provide this variable, we shouldn't use it here.
add 9fb713d GUACAMOLE-637: Correct grammar of documentation for guac_strl*() unit tests.
add ba8fd17 GUACAMOLE-637: "concatentation" ... not "contatenation".
add 350d8e5 GUACAMOLE-637: Document failsafe behavior of guac_strlcat() in the event the destination buffer is not terminated as required.
add c6feef6 GUACAMOLE-637: Clarify purpose of initial empty path component. Fix normalization logic to ensure that empty component is always present.
add 24ab5ca GUACAMOLE-637: Remove unnecessary .gitignore files. Universally exclude test output. Remove duplicated exclusions.
add f19754c GUACAMOLE-637: Add unit tests for SFTP path normalization.
add 591e494 GUACAMOLE-637: Add unit tests for RDP filesystem path normalization.
add 1591980 GUACAMOLE-637: Simplify SFTP path normalization logic. Correct behavior to match documentation.
add 986f7f5 GUACAMOLE-637: Use same logic for RDP filesystem path normalization as SFTP.
add 6e2be38 GUACAMOLE-637: Add path depth limits to generated paths in unit tests.
add cda7bca GUACAMOLE-637: Add RDP filesystem and SFTP unit tests for path depth.
add f8ec709 GUACAMOLE-637: Correct naming of SFTP unit tests.
new dd4c396 GUACAMOLE-637: Merge migration to new libguac string functions.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 4 +
README-unit-testing.md | 2 +-
configure.ac | 17 ++
src/{common => common-ssh}/.gitignore | 6 +-
src/common-ssh/Makefile.am | 1 +
src/common-ssh/common-ssh/sftp.h | 25 +++
src/common-ssh/sftp.c | 211 +++++++------------
src/{common => common-ssh}/tests/Makefile.am | 34 ++-
src/common-ssh/tests/sftp/normalize_path.c | 263 ++++++++++++++++++++++++
src/common/.gitignore | 4 -
src/common/clipboard.c | 4 +-
src/common/tests/Makefile.am | 2 +-
src/guacd/.gitignore | 35 ----
src/libguac/.gitignore | 4 -
src/libguac/Makefile.am | 4 +-
src/libguac/audio.c | 11 +-
src/libguac/client.c | 30 +--
src/libguac/encode-jpeg.c | 6 +-
src/libguac/encode-jpeg.h | 4 +-
src/libguac/encode-png.c | 6 +-
src/libguac/encode-png.h | 4 +-
src/libguac/encode-webp.c | 6 +-
src/libguac/encode-webp.h | 4 +-
src/libguac/error.c | 2 +-
src/libguac/guacamole/string.h | 161 +++++++++++++++
src/libguac/id.c | 2 +-
src/libguac/parser.c | 8 +-
src/libguac/pool.c | 2 +-
src/libguac/protocol.c | 14 +-
src/libguac/raw_encoder.c | 12 +-
src/libguac/raw_encoder.h | 2 +-
src/libguac/socket-broadcast.c | 8 +-
src/libguac/socket-fd.c | 4 +-
src/libguac/socket-nest.c | 6 +-
src/libguac/socket-ssl.c | 6 +-
src/libguac/socket-tee.c | 2 +-
src/libguac/socket-wsa.c | 4 +-
src/libguac/socket.c | 8 +-
src/libguac/string.c | 107 ++++++++++
src/libguac/tests/Makefile.am | 5 +-
src/libguac/tests/string/strlcat.c | 153 ++++++++++++++
src/libguac/tests/string/strlcpy.c | 102 +++++++++
src/libguac/tests/string/strljoin.c | 148 +++++++++++++
src/libguac/timestamp.c | 2 +-
src/libguac/unicode.c | 2 +-
src/libguac/user-handlers.c | 12 +-
src/libguac/user-handlers.h | 4 +-
src/libguac/user-handshake.c | 12 +-
src/libguac/user.c | 16 +-
src/protocols/rdp/.gitignore | 37 +---
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/guac_svc/svc_service.c | 3 +-
src/protocols/rdp/keymaps/generate.pl | 2 +-
src/protocols/rdp/rdp_fs.c | 98 ++++-----
src/protocols/rdp/rdp_fs.h | 5 +
src/protocols/rdp/rdp_settings.c | 9 +-
src/protocols/rdp/rdp_stream.c | 5 +-
src/protocols/rdp/rdp_svc.c | 14 +-
src/protocols/rdp/rdp_svc.h | 7 +-
src/{common => protocols/rdp}/tests/Makefile.am | 34 ++-
src/protocols/rdp/tests/fs/normalize_path.c | 256 +++++++++++++++++++++++
src/protocols/ssh/.gitignore | 36 ----
src/protocols/telnet/.gitignore | 36 ----
src/protocols/vnc/.gitignore | 36 ----
util/generate-test-runner.pl | 2 +-
65 files changed, 1521 insertions(+), 551 deletions(-)
copy src/{common => common-ssh}/.gitignore (57%)
copy src/{common => common-ssh}/tests/Makefile.am (72%)
create mode 100644 src/common-ssh/tests/sftp/normalize_path.c
create mode 100644 src/libguac/guacamole/string.h
create mode 100644 src/libguac/string.c
create mode 100644 src/libguac/tests/string/strlcat.c
create mode 100644 src/libguac/tests/string/strlcpy.c
create mode 100644 src/libguac/tests/string/strljoin.c
copy src/{common => protocols/rdp}/tests/Makefile.am (71%)
create mode 100644 src/protocols/rdp/tests/fs/normalize_path.c
delete mode 100644 src/protocols/ssh/.gitignore
delete mode 100644 src/protocols/telnet/.gitignore
delete mode 100644 src/protocols/vnc/.gitignore
[guacamole-server] 01/01: GUACAMOLE-637: Merge migration to new
libguac string functions.
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit dd4c3968d17bd166a9e294c1437c1e554518e5b3
Merge: 3989c40 f8ec709
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Tue Apr 9 21:49:16 2019 -0700
GUACAMOLE-637: Merge migration to new libguac string functions.
.gitignore | 4 +
README-unit-testing.md | 2 +-
configure.ac | 17 ++
src/{common => common-ssh}/.gitignore | 6 +-
src/common-ssh/Makefile.am | 1 +
src/common-ssh/common-ssh/sftp.h | 25 +++
src/common-ssh/sftp.c | 211 +++++++------------
src/{common => common-ssh}/tests/Makefile.am | 34 ++-
src/common-ssh/tests/sftp/normalize_path.c | 263 ++++++++++++++++++++++++
src/common/.gitignore | 4 -
src/common/clipboard.c | 4 +-
src/common/tests/Makefile.am | 2 +-
src/guacd/.gitignore | 35 ----
src/libguac/.gitignore | 4 -
src/libguac/Makefile.am | 4 +-
src/libguac/audio.c | 11 +-
src/libguac/client.c | 30 +--
src/libguac/encode-jpeg.c | 6 +-
src/libguac/encode-jpeg.h | 4 +-
src/libguac/encode-png.c | 6 +-
src/libguac/encode-png.h | 4 +-
src/libguac/encode-webp.c | 6 +-
src/libguac/encode-webp.h | 4 +-
src/libguac/error.c | 2 +-
src/libguac/guacamole/string.h | 161 +++++++++++++++
src/libguac/id.c | 2 +-
src/libguac/parser.c | 8 +-
src/libguac/pool.c | 2 +-
src/libguac/protocol.c | 14 +-
src/libguac/raw_encoder.c | 12 +-
src/libguac/raw_encoder.h | 2 +-
src/libguac/socket-broadcast.c | 8 +-
src/libguac/socket-fd.c | 4 +-
src/libguac/socket-nest.c | 6 +-
src/libguac/socket-ssl.c | 6 +-
src/libguac/socket-tee.c | 2 +-
src/libguac/socket-wsa.c | 4 +-
src/libguac/socket.c | 8 +-
src/libguac/string.c | 107 ++++++++++
src/libguac/tests/Makefile.am | 5 +-
src/libguac/tests/string/strlcat.c | 153 ++++++++++++++
src/libguac/tests/string/strlcpy.c | 102 +++++++++
src/libguac/tests/string/strljoin.c | 148 +++++++++++++
src/libguac/timestamp.c | 2 +-
src/libguac/unicode.c | 2 +-
src/libguac/user-handlers.c | 12 +-
src/libguac/user-handlers.h | 4 +-
src/libguac/user-handshake.c | 12 +-
src/libguac/user.c | 16 +-
src/protocols/rdp/.gitignore | 37 +---
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/guac_svc/svc_service.c | 3 +-
src/protocols/rdp/keymaps/generate.pl | 2 +-
src/protocols/rdp/rdp_fs.c | 98 ++++-----
src/protocols/rdp/rdp_fs.h | 5 +
src/protocols/rdp/rdp_settings.c | 9 +-
src/protocols/rdp/rdp_stream.c | 5 +-
src/protocols/rdp/rdp_svc.c | 14 +-
src/protocols/rdp/rdp_svc.h | 7 +-
src/{common => protocols/rdp}/tests/Makefile.am | 34 ++-
src/protocols/rdp/tests/fs/normalize_path.c | 256 +++++++++++++++++++++++
src/protocols/ssh/.gitignore | 36 ----
src/protocols/telnet/.gitignore | 36 ----
src/protocols/vnc/.gitignore | 36 ----
util/generate-test-runner.pl | 2 +-
65 files changed, 1521 insertions(+), 551 deletions(-)
diff --cc src/libguac/Makefile.am
index 16b0e2c,ffcfffc..dc96a87
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@@ -122,10 -124,10 +124,10 @@@ libguacinc_HEADERS += guacamole/socket-
endif
libguac_la_CFLAGS = \
- -Werror -Wall -pedantic -I$(srcdir)/guacamole
+ -Werror -Wall -pedantic
libguac_la_LDFLAGS = \
- -version-info 16:0:0 \
+ -version-info 17:0:0 \
-no-undefined \
@CAIRO_LIBS@ \
@DL_LIBS@ \