X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;ds=inline;f=src%2Fapps%2FPswGen%2FCLI%2Fcli.cpp;h=56a49fbaed94fa684806b3f92220d0bf94e0cb90;hb=a81a943bee20df3c7eb34bafb3e3fe878facfe4e;hp=fbc8450ebe37f2ec2ddba2170994a536587df353;hpb=cdc02ee6da9c883125d5cff563bdcfcc0bf2b7b8;p=evaf
diff --git a/src/apps/PswGen/CLI/cli.cpp b/src/apps/PswGen/CLI/cli.cpp
index fbc8450..56a49fb 100644
--- a/src/apps/PswGen/CLI/cli.cpp
+++ b/src/apps/PswGen/CLI/cli.cpp
@@ -3,7 +3,7 @@
* @brief Command line interface for the PswGen application
* @author Enar Vaikene
*
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2012 Enar Vaikene
*
* This file is part of the eVaf C++ cross-platform application development framework.
*
@@ -18,7 +18,6 @@
*/
#include "cli.h"
-#include "version.h"
#include
#include
@@ -29,6 +28,7 @@
#include
#include
#include
+#include
#include
@@ -41,7 +41,6 @@
#endif
VER_EXPORT_VERSION_INFO()
-Q_EXPORT_PLUGIN2(VER_MODULE_NAME_STR, eVaf::PswGen::CLI::Module)
//-------------------------------------------------------------------
@@ -54,8 +53,8 @@ int const Module::DefaultPasswordLength = 16;
Module::Module()
: Plugins::iPlugin()
, mReady(false)
- , mGenerator(false)
- , mStorage(false)
+ , mGenerator(0)
+ , mStorage(0)
, mEvReady(0)
{
setObjectName(QString("%1-Module").arg(VER_MODULE_NAME_STR));
@@ -159,7 +158,10 @@ void Module::generatePassword()
{
QString masterPassword;
QString appName;
- int passwordLength = DefaultPasswordLength;
+ QString suffix;
+ int passwordLength = 0;
+ uint flags = 0;
+ int alnum = -1;
// Process command-line arguments
QStringList args = QCoreApplication::arguments();
@@ -170,6 +172,18 @@ void Module::generatePassword()
masterPassword = arg.at(1);
else if (QRegExp("-[-]?n(ame)?").exactMatch(arg.at(0)) && arg.size() > 1)
appName = arg.at(1);
+ else if (QRegExp("-[-]?s(uffix)?").exactMatch(arg.at(0)) && arg.size() > 1)
+ suffix = arg.at(1);
+ else if (QRegExp("-[-]?a(lphanumeric)?").exactMatch(arg.at(0))) {
+ if (arg.size() > 1) {
+ if (Common::isTrue(arg.at(1)))
+ alnum = 1;
+ else if (Common::isFalse(arg.at(1)))
+ alnum = 0;
+ }
+ else
+ alnum = 1;
+ }
else if (QRegExp("-[-]?l(ength)?").exactMatch(arg.at(0)) && arg.size() > 1) {
bool ok;
int t = arg.at(1).toInt(&ok);
@@ -181,6 +195,14 @@ void Module::generatePassword()
}
}
+ // Set flags
+ if (alnum != -1) {
+ if (alnum == 1)
+ flags |= uint(iGenerator::ALPHANUMERIC);
+ else
+ flags &= ~uint(iGenerator::ALPHANUMERIC);
+ }
+
QTextStream cin(stdin);
QTextStream cout(stdout);
@@ -199,18 +221,32 @@ void Module::generatePassword()
QExplicitlySharedDataPointer data;
if (mStorage) {
data = mStorage->query(appName);
- if (data)
- passwordLength = data->length();
+ if (data) {
+ if (passwordLength == 0)
+ passwordLength = data->length();
+ if (suffix.isEmpty())
+ suffix = data->suffix();
+ if (alnum == -1)
+ flags = data->flags();
+ }
}
+ // If the length argument is still not initialized, use the default length value
+ if (!passwordLength)
+ passwordLength = DefaultPasswordLength;
+
// Generate password
- QString password = mGenerator->generatePassword(appName, masterPassword, passwordLength);
+ QString password = mGenerator->generatePassword(appName + suffix, masterPassword, passwordLength);
cout << "Generated password : " << password << endl;
// Store arguments for this password
if (mStorage) {
if (!data)
- data = new Storage::Data(appName, passwordLength);
+ data = new Storage::Data(appName, suffix, passwordLength);
+ else {
+ data->setSuffix(suffix);
+ data->setLength(passwordLength);
+ }
mStorage->save(appName, data);
}
}