experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Parse the URI from scheme and allow only [a-zA-Z][0-9a-zA-Z.]*

Browse Source 
Change: 119338733
This commit is contained in:
Manjunath Kudlur 2016-04-07 19:59:40 -08:00 committed by TensorFlower Gardener
parent 9efcb9f8b2
commit 74cba0ccae
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tensorflow/core/platform/env_test.cc
View File

@ -116,4 +116,15 @@ TEST(EnvTest, IPFS) {
} }
} }
TEST(EnvTest, GetSchemeForURI) {
EXPECT_EQ(GetSchemeFromURI("http://foo"), "http");
EXPECT_EQ(GetSchemeFromURI("/encrypted/://foo"), "");
EXPECT_EQ(GetSchemeFromURI("/usr/local/foo"), "");
EXPECT_EQ(GetSchemeFromURI("file:///usr/local/foo"), "file");
EXPECT_EQ(GetSchemeFromURI("local.file:///usr/local/foo"), "local.file");
EXPECT_EQ(GetSchemeFromURI("a-b:///foo"), "");
EXPECT_EQ(GetSchemeFromURI(":///foo"), "");
EXPECT_EQ(GetSchemeFromURI("9dfd:///foo"), "");
}
} // namespace tensorflow } // namespace tensorflow

9
tensorflow/core/platform/file_system.cc
View File

@ -17,6 +17,7 @@ limitations under the License.
#include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/gtl/map_util.h" #include "tensorflow/core/lib/gtl/map_util.h"
#include "tensorflow/core/lib/gtl/stl_util.h" #include "tensorflow/core/lib/gtl/stl_util.h"
#include "tensorflow/core/lib/strings/scanner.h"
#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/protobuf.h"
@ -66,7 +67,13 @@ FileSystem* FileSystemRegistryImpl::Lookup(const string& scheme) {
string GetSchemeFromURI(const string& name) { string GetSchemeFromURI(const string& name) {
auto colon_loc = name.find(":"); auto colon_loc = name.find(":");
if (colon_loc != string::npos) { // Make sure scheme matches [a-zA-Z][0-9a-zA-Z.]*
// TODO(keveman): Allow "+" and "-" in the scheme.
if (colon_loc != string::npos &&
strings::Scanner(StringPiece(name.data(), colon_loc))
.One(strings::Scanner::LETTER)
.Many(strings::Scanner::LETTER_DIGIT_DOT)
.GetResult()) {
return name.substr(0, colon_loc); return name.substr(0, colon_loc);
} }
return ""; return "";