michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-27 16:17:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wi-Fi: password -> passphrase

Browse source
This commit is contained in:
Nicolas Mailloux 2022-08-22 17:10:09 -04:00
parent c49da9dc90
commit edffb452bd
8 changed files with 128 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/widgets/dialogs/generaldialog.cpp
View file

@ -497,7 +497,7 @@ void generalDialog::on_okBtn_clicked()
if(!global::keyboard::keyboardText.isEmpty()) {
if(global::keyboard::keyboardText.count() < 8) {
global::toast::delay = 3000;
showToast("Minimum password length is 8 characters");
showToast("Minimum passphrase length is 8 characters");
}
else {
generalDialog::close();

146
src/widgets/dialogs/wifi/connectiondialog.cpp
View file

@ -21,7 +21,7 @@ connectiondialog::connectiondialog(QWidget *parent) :
ui->cancelBtn->setStyleSheet("font-size: 9pt");
ui->connectBtn->setStyleSheet("font-size: 9pt");
ui->showPasswordBtn->setStyleSheet("font-size: 9pt");
ui->showPassphraseBtn->setStyleSheet("font-size: 9pt");
// Size
QRect screenGeometry = QGuiApplication::screens()[0]->geometry();
@ -42,12 +42,12 @@ void connectiondialog::applyVariables() {
ui->signalLabel->setText(QString::number(connectedNetworkData.signal) + "%");
if(connectedNetworkData.encryption == false) {
ui->showPasswordBtn->hide();
ui->passwordTextEdit->setText("No password required");
ui->passwordTextEdit->setDisabled(true);
ui->showPassphraseBtn->hide();
ui->passphraseTextEdit->setText("No passphrase required");
ui->passphraseTextEdit->setDisabled(true);
}
else {
if(passwordDatabase.exists() == false) {
if(passphraseDatabase.exists() == false) {
log("Creating empty database", className);
// https://forum.qt.io/topic/104791/how-i-can-create-json-format-in-qt/5
QJsonObject root;
@ -56,33 +56,33 @@ void connectiondialog::applyVariables() {
root["list"] = array;
newJsonDocument.setObject(root);
passwordDatabase.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
passwordDatabase.write(newJsonDocument.toJson());
passwordDatabase.flush();
passwordDatabase.close();
passphraseDatabase.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
passphraseDatabase.write(newJsonDocument.toJson());
passphraseDatabase.flush();
passphraseDatabase.close();
}
QString password = searchDatabase(connectedNetworkData.name);
if(password.isEmpty() == false) {
log("Found password: " + password, className);
ui->showPasswordBtn->setIcon(QIcon(":/resources/show.png"));
showedPassword = false;
savedPassword = password;
QString passphrase = searchDatabase(connectedNetworkData.name);
if(passphrase.isEmpty() == false) {
log("Found passphrase: " + passphrase, className);
ui->showPassphraseBtn->setIcon(QIcon(":/resources/show.png"));
showedPassphrase = false;
savedPassphrase = passphrase;
ui->passwordTextEdit->setText("********");
ui->passphraseTextEdit->setText("********");
}
else {
log("No password found", className);
ui->passwordTextEdit->setText("No password was saved");
showedPassword = true;
ui->showPasswordBtn->hide();
log("No passphrase found", className);
ui->passphraseTextEdit->setText("No passphrase was saved");
showedPassphrase = true;
ui->showPassphraseBtn->hide();
}
}
}
QString connectiondialog::searchDatabase(QString key) {
passwordDatabase.open(QIODevice::ReadOnly | QIODevice::Text);
QString fileRead = passwordDatabase.readAll();
passwordDatabase.close();
passphraseDatabase.open(QIODevice::ReadOnly | QIODevice::Text);
QString fileRead = passphraseDatabase.readAll();
passphraseDatabase.close();
QJsonDocument jsonDocument = QJsonDocument::fromJson(fileRead.toUtf8());
if(jsonDocument["list"].isArray() == true) {
@ -92,9 +92,9 @@ QString connectiondialog::searchDatabase(QString key) {
QString searchedName = jsonMainObject.keys().first().toUtf8();
log("Found in database: '" + searchedName + "'", className);
if(searchedName == key) {
QString returnedPassword = jsonMainObject.value(key).toString();
log("Searched name '" + searchedName + "' matched '" + key + "' and the password is: '" + returnedPassword + "'", className);
return returnedPassword;
QString returnedPassphrase = jsonMainObject.value(key).toString();
log("Searched name '" + searchedName + "' matched '" + key + "' and the passphrase is: '" + returnedPassphrase + "'", className);
return returnedPassphrase;
}
else {
log("Searched name '" + searchedName + "' doesn't match '" + key + "'", className);
@ -107,14 +107,14 @@ QString connectiondialog::searchDatabase(QString key) {
}
}
void connectiondialog::writeToDatabase(QString name, QString password) {
void connectiondialog::writeToDatabase(QString name, QString passphrase) {
if(searchDatabase(name).isEmpty() == false) {
removeFromDatabase(name);
}
passwordDatabase.open(QIODevice::ReadOnly | QIODevice::Text);
QString fileRead = passwordDatabase.readAll();
passwordDatabase.close();
passphraseDatabase.open(QIODevice::ReadOnly | QIODevice::Text);
QString fileRead = passphraseDatabase.readAll();
passphraseDatabase.close();
QJsonDocument jsonDocument = QJsonDocument::fromJson(fileRead.toUtf8());
if(jsonDocument["list"].isArray() == true) {
@ -123,7 +123,7 @@ void connectiondialog::writeToDatabase(QString name, QString password) {
// https://stackoverflow.com/questions/26804660/how-to-initialize-qjsonobject-from-qstring
// I hoped this would be easier
QJsonObject newObject = QJsonDocument::fromJson(QString("{\"" + name + "\" : \"" + password + "\" }").toUtf8()).object();
QJsonObject newObject = QJsonDocument::fromJson(QString("{\"" + name + "\" : \"" + passphrase + "\" }").toUtf8()).object();
jsonArray.append(newObject);
QJsonDocument newJsonDocument;
@ -131,10 +131,10 @@ void connectiondialog::writeToDatabase(QString name, QString password) {
root["list"] = jsonArray;
newJsonDocument.setObject(root);
passwordDatabase.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
passwordDatabase.write(newJsonDocument.toJson());
passwordDatabase.flush();
passwordDatabase.close();
passphraseDatabase.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
passphraseDatabase.write(newJsonDocument.toJson());
passphraseDatabase.flush();
passphraseDatabase.close();
}
else {
log("Something went horribly wrong", className);
@ -142,9 +142,9 @@ void connectiondialog::writeToDatabase(QString name, QString password) {
}
void connectiondialog::removeFromDatabase(QString name) {
passwordDatabase.open(QIODevice::ReadOnly | QIODevice::Text);
QString fileRead = passwordDatabase.readAll();
passwordDatabase.close();
passphraseDatabase.open(QIODevice::ReadOnly | QIODevice::Text);
QString fileRead = passphraseDatabase.readAll();
passphraseDatabase.close();
QJsonDocument jsonDocument = QJsonDocument::fromJson(fileRead.toUtf8());
int counter = 0;
@ -169,10 +169,10 @@ void connectiondialog::removeFromDatabase(QString name) {
root["list"] = jsonArray;
newJsonDocument.setObject(root);
passwordDatabase.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
passwordDatabase.write(newJsonDocument.toJson());
passwordDatabase.flush();
passwordDatabase.close();
passphraseDatabase.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
passphraseDatabase.write(newJsonDocument.toJson());
passphraseDatabase.flush();
passphraseDatabase.close();
}
else {
log("ERROR: tried to remove from database, but couldn't find key", className);
@ -186,18 +186,18 @@ void connectiondialog::on_cancelBtn_clicked()
this->close();
}
void connectiondialog::on_passwordTextEdit_selectionChanged()
void connectiondialog::on_passphraseTextEdit_selectionChanged()
{
ui->passwordTextEdit->setSelection(0, 0);
ui->passphraseTextEdit->setSelection(0, 0);
}
void connectiondialog::on_passwordTextEdit_cursorPositionChanged(int oldpos, int newpos)
void connectiondialog::on_passphraseTextEdit_cursorPositionChanged(int oldpos, int newpos)
{
log("Detected click on text edit widget", className);
if(cursorPositionIgnore == true) {
if(newpos != 0) {
if(showedPassword == true) {
ui->passwordTextEdit->setCursorPosition(0);
if(showedPassphrase == true) {
ui->passphraseTextEdit->setCursorPosition(0);
global::keyboard::keyboardDialog = true;
global::keyboard::wifiPassphraseDialog = true;
global::keyboard::keyboardText = "";
@ -212,19 +212,19 @@ void connectiondialog::on_passwordTextEdit_cursorPositionChanged(int oldpos, int
global::keyboard::keyboardDialog = false;
global::keyboard::wifiPassphraseDialog = false;
if(global::keyboard::keyboardText.isEmpty() == false) {
// A bit hacky: avoid summoning the keyboard back when the text is changing (and the cursor too) showedPassword shouldn't be used for this, but it works and adding another boolean would start being messy
showedPassword = false;
ui->passwordTextEdit->setText(global::keyboard::keyboardText);
ui->showPasswordBtn->setIcon(QIcon(":/resources/hide.png"));
ui->showPasswordBtn->show();
showedPassword = true;
savedPassword = global::keyboard::keyboardText;
ui->showPasswordBtn->show();
// A bit hacky: avoid summoning the keyboard back when the text is changing (and the cursor too) showedPassphrase shouldn't be used for this, but it works and adding another boolean would start being messy
showedPassphrase = false;
ui->passphraseTextEdit->setText(global::keyboard::keyboardText);
ui->showPassphraseBtn->setIcon(QIcon(":/resources/hide.png"));
ui->showPassphraseBtn->show();
showedPassphrase = true;
savedPassphrase = global::keyboard::keyboardText;
ui->showPassphraseBtn->show();
}
global::keyboard::keyboardText = "";
}
else {
log("Password is not saved; ignoring text edit call", className);
log("Passphrase is not saved; ignoring text edit call", className);
}
}
}
@ -238,17 +238,17 @@ void connectiondialog::showToastSlot(QString message) {
emit showToastSignal(message);
}
void connectiondialog::on_showPasswordBtn_clicked()
void connectiondialog::on_showPassphraseBtn_clicked()
{
if(showedPassword == false) {
ui->showPasswordBtn->setIcon(QIcon(":/resources/hide.png"));
ui->passwordTextEdit->setText(savedPassword);
showedPassword = true;
if(showedPassphrase == false) {
ui->showPassphraseBtn->setIcon(QIcon(":/resources/hide.png"));
ui->passphraseTextEdit->setText(savedPassphrase);
showedPassphrase = true;
}
else {
showedPassword = false;
ui->showPasswordBtn->setIcon(QIcon(":/resources/show.png"));
ui->passwordTextEdit->setText("********");
showedPassphrase = false;
ui->showPassphraseBtn->setIcon(QIcon(":/resources/show.png"));
ui->passphraseTextEdit->setText("********");
}
}
@ -259,28 +259,28 @@ void connectiondialog::refreshScreenSlot() {
void connectiondialog::on_connectBtn_clicked()
{
QString finalPassword;
QString finalPassphrase;
if(connectedNetworkData.encryption == false) {
finalPassword = "NONE";
finalPassphrase = "NONE";
}
else {
if(savedPassword.isEmpty() == false) {
finalPassword = savedPassword;
writeToDatabase(connectedNetworkData.name, savedPassword);
if(savedPassphrase.isEmpty() == false) {
finalPassphrase = savedPassphrase;
writeToDatabase(connectedNetworkData.name, savedPassphrase);
}
else {
showToastSlot("Provide a password first");
showToastSlot("Provide a passphrase first");
return void();
}
}
passwordForReconnecting = finalPassword;
passphraseForReconnecting = finalPassphrase;
ui->cancelBtn->setEnabled(false);
if(checkWifiState() == global::wifi::wifiState::configured) {
string_writeconfig("/opt/ibxd", "stop_wifi_operations\n");
}
writeFile("/run/wifi_network_essid", connectedNetworkData.name);
writeFile("/run/wifi_network_passphrase", finalPassword);
writeFile("/run/wifi_network_passphrase", finalPassphrase);
finalConnectWait();
}
@ -307,7 +307,7 @@ void connectiondialog::finalConnectWait() {
// This will be deleted later in MainWindow's icon updater if it failed. It is also deleted in the Wi-Fi stop script
log("Writing to config directory with connection information data", className);
string_writeconfig("/mnt/onboard/.adds/inkbox/.config/17-wifi_connection_information/essid", connectedNetworkData.name.toStdString());
string_writeconfig("/mnt/onboard/.adds/inkbox/.config/17-wifi_connection_information/passphrase", passwordForReconnecting.toStdString());
string_writeconfig("/mnt/onboard/.adds/inkbox/.config/17-wifi_connection_information/passphrase", passphraseForReconnecting.toStdString());
this->deleteLater();
this->close();

16
src/widgets/dialogs/wifi/connectiondialog.h
View file

@ -18,7 +18,7 @@ public:
~connectiondialog();
global::wifi::wifiNetworkData connectedNetworkData;
QString currentlyConnectedNetworkName;
QFile passwordDatabase = QFile("/mnt/onboard/.adds/inkbox/.config/17-wifi_connection_information/passwords.json");
QFile passphraseDatabase = QFile("/mnt/onboard/.adds/inkbox/.config/17-wifi_connection_information/passphrases.json");
signals:
void showToastSignal(QString message);
@ -34,25 +34,25 @@ private slots:
// 1. It's modular
// 2. Those operations are rare
QString searchDatabase(QString key);
void writeToDatabase(QString name, QString password);
void writeToDatabase(QString name, QString passphrase);
void removeFromDatabase(QString name);
void finalConnectWait();
bool checkIfWifiBusy();
void on_cancelBtn_clicked();
void on_passwordTextEdit_selectionChanged();
void on_passwordTextEdit_cursorPositionChanged(int arg1, int arg2);
void on_showPasswordBtn_clicked();
void on_passphraseTextEdit_selectionChanged();
void on_passphraseTextEdit_cursorPositionChanged(int arg1, int arg2);
void on_showPassphraseBtn_clicked();
void on_connectBtn_clicked();
private:
Ui::connectiondialog *ui;
bool cursorPositionIgnore = false;
bool showedPassword;
QString savedPassword;
bool showedPassphrase;
QString savedPassphrase;
int waitTry = 0;
QString passwordForReconnecting;
QString passphraseForReconnecting;
};
#endif // CONNECTIONDIALOG_H

4
src/widgets/dialogs/wifi/connectiondialog.ui
View file

@ -71,7 +71,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="passwordTextEdit">
<widget class="QLineEdit" name="passphraseTextEdit">
<property name="cursor">
<cursorShape>BlankCursor</cursorShape>
</property>
@ -81,7 +81,7 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="showPasswordBtn">
<widget class="QPushButton" name="showPassphraseBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>

18
src/widgets/dialogs/wifi/wifidialog.cpp
View file

@ -72,7 +72,7 @@ wifiDialog::wifiDialog(QWidget *parent) :
ui->refreshBtn->click();
} else {
wifiButtonEnabled = true;
ui->stopBtn->setStyleSheet("background-color: gray;");
ui->stopBtn->setStyleSheet("background-color: lightGray;");
ui->stopBtn->setEnabled(false);
}
@ -105,7 +105,7 @@ void wifiDialog::launchRefresh() {
// Order is important
if(scanInProgress == false) {
scanInProgress = true;
ui->refreshBtn->setStyleSheet("background-color: gray;");
ui->refreshBtn->setStyleSheet("background-color: lightGray;");
ui->refreshBtn->setEnabled(false);
elapsedSeconds = 0;
@ -218,7 +218,7 @@ void wifiDialog::refreshNetworksList() {
int countVec = 0;
int vectorNetworkLocation = 9999;
for(global::wifi::wifiNetworkData wifiNetwork: pureNetworkList) {
if(currentWifiNetwork.isEmpty() == false and wifiNetwork.name.contains(currentWifiNetwork) == true) {
if(currentWifiNetwork.isEmpty() == false and wifiNetwork.name == currentWifiNetwork) {
log("Found current network in vector", className);
vectorNetworkLocation = countVec;
currentNetwork = wifiNetwork.name;
@ -308,9 +308,9 @@ void wifiDialog::on_wifiCheckBox_stateChanged(int arg1)
} else {
log("Turning Wi-Fi off", className);
QTimer::singleShot(0, this, SLOT(turnOffWifi()));
// To inform the wifi icon GUI to don't show the connected/failed to connect message
// To inform the Wi-Fi icon updater to not show the connected/failed to connect message
string_writeconfig("/mnt/onboard/.adds/inkbox/.config/17-wifi_connection_information/stopped", "true");
ui->stopBtn->setStyleSheet("background-color: gray;");
ui->stopBtn->setStyleSheet("background-color: lightGray;");
ui->stopBtn->setEnabled(false);
}
emit killNetworkWidgets();
@ -375,7 +375,7 @@ void wifiDialog::refreshScreenSlot() {
* smarter_time_sync.sh - Syncs time
* toggle.sh - Turns on/off Wi-Fi adapter
* list_networks - Lists networks
* check_wifi_password.sh - Checks Wi-Fi network password
* check_wifi_passphrase.sh - Checks Wi-Fi network passphrase
* watcher() first watches at processes that could kill other ones
*/
@ -426,10 +426,10 @@ void wifiDialog::watcher() {
return void();
}
bool passwordCheck = checkProcessName("check_wifi_password.sh");
if(passwordCheck == true) {
bool passphraseCheck = checkProcessName("check_wifi_passphrase.sh");
if(passphraseCheck == true) {
forceRefresh = true;
setStatusText("Checking Wi-Fi network password");
setStatusText("Checking Wi-Fi network passphrase");
QTimer::singleShot(relaunchMs, this, SLOT(watcher()));
return void();
}

30
src/widgets/dialogs/wifi/wifidialog.ui
View file

@ -124,10 +124,14 @@
<widget class="QLabel" name="label">
<property name="font">
<font>
<family>Inter</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">font-family: Inter</string>
</property>
<property name="text">
<string>Wi-Fi</string>
</property>
@ -144,18 +148,42 @@
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_4">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="statusLabel">
<property name="font">
<font>
<family>u001</family>
<pointsize>9</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 10px; font-family: u001</string>
</property>
<property name="text">
<string>Wi-Fi status</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_5">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
@ -182,7 +210,7 @@
<x>0</x>
<y>0</y>
<width>585</width>
<height>557</height>
<height>538</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">

2
src/widgets/dialogs/wifi/wifilogger.cpp
View file

@ -70,7 +70,7 @@ void wifilogger::setWifiInfoPage() {
}
else {
ui->stackedWidget->setCurrentIndex(1);
ui->nameLabel->setText("Not currently connected to a network");
ui->nameLabel->setText("Not connected to a network");
}
}

6
src/widgets/dialogs/wifi/wifilogger.ui
View file

@ -229,7 +229,7 @@
</font>
</property>
<property name="text">
<string>Password protected:</string>
<string>Passphrase-protected:</string>
</property>
</widget>
</item>
@ -349,10 +349,14 @@
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<family>Inter</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">font-family: Inter; font-weight: bold</string>
</property>
<property name="lineWidth">
<number>0</number>
</property>