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 2017/06/27 04:08:10 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-326:
Explicitly deny attempted reads/writes to Windows named data streams (like
"foo:Zone.identifier" for the file "foo").
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master d9c1ce773 -> 836fc3eaa
GUACAMOLE-326: Explicitly deny attempted reads/writes to Windows named data streams (like "foo:Zone.identifier" for the file "foo").
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/e5a1b4d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/e5a1b4d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/e5a1b4d8
Branch: refs/heads/master
Commit: e5a1b4d8ae50041aac9c71b025af9401c12c165a
Parents: d9c1ce7
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jun 4 13:05:11 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Jun 26 14:40:32 2017 -0700
----------------------------------------------------------------------
src/protocols/rdp/rdp_fs.c | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/e5a1b4d8/src/protocols/rdp/rdp_fs.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_fs.c b/src/protocols/rdp/rdp_fs.c
index 28019d8..88668d8 100644
--- a/src/protocols/rdp/rdp_fs.c
+++ b/src/protocols/rdp/rdp_fs.c
@@ -654,6 +654,10 @@ int guac_rdp_fs_normalize_path(const char* path, char* abs_path) {
} /* end if separator */
+ /* We do not currently support named streams */
+ else if (c == ':')
+ return 1;
+
} /* end for each character */
/* If no components, the path is simply root */
[2/2] incubator-guacamole-server git commit: GUACAMOLE-326: Merge
rejection of reads and writes to Windows data streams.
Posted by jm...@apache.org.
GUACAMOLE-326: Merge rejection of reads and writes to Windows data streams.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/836fc3ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/836fc3ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/836fc3ea
Branch: refs/heads/master
Commit: 836fc3eaa0e22b9e4530ef595e0fc9abb1892c00
Parents: 9ee224f e5a1b4d
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Jun 26 21:05:03 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Jun 26 21:07:09 2017 -0700
----------------------------------------------------------------------
configure.ac | 2 +-
doc/Doxyfile | 2 +-
src/common-ssh/common-ssh/ssh.h | 2 +-
src/common-ssh/ssh.c | 16 +++++++++++++++-
src/guacd/man/guacd.8 | 2 +-
src/guacd/man/guacd.conf.5 | 2 +-
src/guacenc/man/guacenc.1 | 2 +-
src/libguac/Makefile.am | 2 +-
src/protocols/rdp/rdp.c | 2 +-
src/protocols/rdp/rdp_fs.c | 4 ++++
src/protocols/rdp/rdp_settings.c | 13 +++++++++++++
src/protocols/rdp/rdp_settings.h | 8 ++++++++
src/protocols/ssh/settings.c | 13 +++++++++++++
src/protocols/ssh/settings.h | 10 ++++++++++
src/protocols/ssh/ssh.c | 22 ++++++++++++++++++----
src/protocols/vnc/settings.c | 14 ++++++++++++++
src/protocols/vnc/settings.h | 8 ++++++++
src/protocols/vnc/vnc.c | 2 +-
18 files changed, 112 insertions(+), 14 deletions(-)
----------------------------------------------------------------------