Skip to content

PHPC-1044 and PHPC-1045: Bump libmongoc to 1.8.2 and fix auth segfault #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libbson
Submodule libbson updated 3 files
+8 −0 NEWS
+1 −1 VERSION_CURRENT
+1 −1 VERSION_RELEASED
2 changes: 1 addition & 1 deletion src/libmongoc
Submodule libmongoc updated 79 files
+1 −1 .evergreen/check-release-archive.sh
+2 −2 .evergreen/compile-unix.sh
+105 −75 .evergreen/config.yml
+17 −2 .evergreen/link-sample-program-msvc.cmd
+22 −4 .evergreen/link-sample-program.sh
+48 −61 CMakeLists.txt
+1 −1 Makefile.am
+25 −0 NEWS
+0 −60 THIRD_PARTY_NOTICES
+1 −1 VERSION_CURRENT
+1 −1 VERSION_RELEASED
+4 −70 build/autotools/CheckSnappy.m4
+2 −2 build/autotools/CheckZlib.m4
+4 −4 build/autotools/ReadCommandLineArguments.m4
+0 −3 build/autotools/SetupAutomake.m4
+46 −53 build/cmake/FindSnappy.cmake
+1 −1 build/cmake/libmongoc-1.0-config.cmake.in
+6 −1 build/cmake/libmongoc-static-1.0-config.cmake.in
+9 −4 configure.ac
+1 −1 doc/installing.rst
+0 −3 src/Makefile.am
+1 −1 src/libbson
+0 −22 src/mongoc/Makefile.am
+8 −0 src/mongoc/mongoc-scram.c
+0 −1 src/snappy-1.1.3/AUTHORS
+0 −54 src/snappy-1.1.3/COPYING
+0 −2,468 src/snappy-1.1.3/ChangeLog
+0 −370 src/snappy-1.1.3/INSTALL
+0 −20 src/snappy-1.1.3/Makefile.am
+0 −1,325 src/snappy-1.1.3/Makefile.in
+0 −140 src/snappy-1.1.3/NEWS
+0 −135 src/snappy-1.1.3/README
+0 −9,912 src/snappy-1.1.3/aclocal.m4
+0 −7 src/snappy-1.1.3/autogen.sh
+0 −347 src/snappy-1.1.3/compile
+0 −1,558 src/snappy-1.1.3/config.guess
+0 −134 src/snappy-1.1.3/config.h.in
+0 −1,791 src/snappy-1.1.3/config.sub
+0 −19,015 src/snappy-1.1.3/configure
+0 −133 src/snappy-1.1.3/configure.ac
+0 −791 src/snappy-1.1.3/depcomp
+0 −110 src/snappy-1.1.3/format_description.txt
+0 −135 src/snappy-1.1.3/framing_format.txt
+0 −527 src/snappy-1.1.3/install-sh
+0 −9,661 src/snappy-1.1.3/ltmain.sh
+0 −74 src/snappy-1.1.3/m4/gtest.m4
+0 −215 src/snappy-1.1.3/missing
+0 −90 src/snappy-1.1.3/snappy-c.cc
+0 −138 src/snappy-1.1.3/snappy-c.h
+0 −150 src/snappy-1.1.3/snappy-internal.h
+0 −104 src/snappy-1.1.3/snappy-sinksource.cc
+0 −182 src/snappy-1.1.3/snappy-sinksource.h
+0 −42 src/snappy-1.1.3/snappy-stubs-internal.cc
+0 −495 src/snappy-1.1.3/snappy-stubs-internal.h
+0 −98 src/snappy-1.1.3/snappy-stubs-public.h.in
+0 −609 src/snappy-1.1.3/snappy-test.cc
+0 −597 src/snappy-1.1.3/snappy-test.h
+0 −1,555 src/snappy-1.1.3/snappy.cc
+0 −203 src/snappy-1.1.3/snappy.h
+0 −1,418 src/snappy-1.1.3/snappy_unittest.cc
+0 −139 src/snappy-1.1.3/test-driver
+0 −3,609 src/snappy-1.1.3/testdata/alice29.txt
+0 −4,122 src/snappy-1.1.3/testdata/asyoulik.txt
+ src/snappy-1.1.3/testdata/baddata1.snappy
+ src/snappy-1.1.3/testdata/baddata2.snappy
+ src/snappy-1.1.3/testdata/baddata3.snappy
+ src/snappy-1.1.3/testdata/fireworks.jpeg
+ src/snappy-1.1.3/testdata/geo.protodata
+0 −1 src/snappy-1.1.3/testdata/html
+0 −1 src/snappy-1.1.3/testdata/html_x_4
+ src/snappy-1.1.3/testdata/kppkn.gtb
+0 −7,519 src/snappy-1.1.3/testdata/lcet10.txt
+ src/snappy-1.1.3/testdata/paper-100k.pdf
+0 −10,699 src/snappy-1.1.3/testdata/plrabn12.txt
+0 −10,000 src/snappy-1.1.3/testdata/urls.10K
+1 −1 tests/Makefile.am
+3 −0 tests/test-libmongoc.c
+42 −0 tests/test-mongoc-scram.c
+2 −36 tests/test-mongoc-topology.c
25 changes: 25 additions & 0 deletions tests/connect/bug1045.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--TEST--
PHPC-1045: Segfault if username is not provided for SCRAM-SHA-1 authMechanism
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php

require_once __DIR__ . "/../utils/basic.inc";

// STANDALONE does not support auth, but that is not necessary for the test
$m = new MongoDB\Driver\Manager(STANDALONE, ['authMechanism' => 'SCRAM-SHA-1', 'ssl' => false]);

// Execute a basic ping command to trigger connection initialization
echo throws(function() use ($m) {
$m->executeCommand('admin', new MongoDB\Driver\Command(['ping'=>1]));
}, 'MongoDB\Driver\Exception\RuntimeException'), "\n";

?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\RuntimeException
SCRAM Failure: username is not set
===DONE===