kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-24 04:20:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #353 from kiwix/trust_library

Browse Source 
[serve] Trust the library by default.
This commit is contained in:
Matthieu Gautier 2020-02-05 11:06:05 +01:00 committed by GitHub
commit 19c3ebe629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/kiwix-serve.cpp
View File

@ -66,6 +66,7 @@ void usage()
<< "\t-v, --verbose\t\tprint debug log to STDOUT" << std::endl
<< "\t-V, --version\t\tprint software version" << std::endl
<< "\t-z, --nodatealiases\tcreate URL aliases for each content by removing the date" << std::endl
<< "\t--donottrustlibrary\tRead the metadata from the zim file instead of trusting the library." << std::endl
<< std::endl
<< "Documentation:" << std::endl
@ -90,6 +91,7 @@ int main(int argc, char** argv)
bool noSearchBarFlag = false;
bool noDateAliasesFlag = false;
bool isVerboseFlag = false;
bool trustlibrary = true;
string PPIDString;
unsigned int PPID = 0;
@ -106,6 +108,7 @@ int main(int argc, char** argv)
{"address", required_argument, 0, 'i'},
{"threads", required_argument, 0, 't'},
{"urlRootLocation", required_argument, 0, 'r'},
{"donottrustlibrary", no_argument, 0, 'T'},
{0, 0, 0, 0}};
/* Argument parsing */
@ -137,6 +140,8 @@ int main(int argc, char** argv)
case 'm':
noLibraryButtonFlag = true;
break;
case 'T':
trustlibrary = false;
case 'p':
serverPort = atoi(optarg);
break;
@ -188,7 +193,7 @@ int main(int argc, char** argv)
= isRelativePath(*itr)
? computeAbsolutePath(getCurrentDirectory(), *itr)
: *itr;
retVal = manager.readFile(libraryPath, true);
retVal = manager.readFile(libraryPath, true, trustlibrary);
} catch (...) {
retVal = false;
}