Creates codes, but they are wrong inconsistent
with google authenticator
This commit is contained in:
5
.gitignore
vendored
Normal file
5
.gitignore
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
.pio
|
||||||
|
.vscode/.browse.c_cpp.db*
|
||||||
|
.vscode/c_cpp_properties.json
|
||||||
|
.vscode/launch.json
|
||||||
|
.vscode/ipch
|
||||||
10
.vscode/extensions.json
vendored
Normal file
10
.vscode/extensions.json
vendored
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
||||||
|
// for the documentation about the extensions.json format
|
||||||
|
"recommendations": [
|
||||||
|
"platformio.platformio-ide"
|
||||||
|
],
|
||||||
|
"unwantedRecommendations": [
|
||||||
|
"ms-vscode.cpptools-extension-pack"
|
||||||
|
]
|
||||||
|
}
|
||||||
39
include/README
Normal file
39
include/README
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
|
||||||
|
This directory is intended for project header files.
|
||||||
|
|
||||||
|
A header file is a file containing C declarations and macro definitions
|
||||||
|
to be shared between several project source files. You request the use of a
|
||||||
|
header file in your project source file (C, C++, etc) located in `src` folder
|
||||||
|
by including it, with the C preprocessing directive `#include'.
|
||||||
|
|
||||||
|
```src/main.c
|
||||||
|
|
||||||
|
#include "header.h"
|
||||||
|
|
||||||
|
int main (void)
|
||||||
|
{
|
||||||
|
...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Including a header file produces the same results as copying the header file
|
||||||
|
into each source file that needs it. Such copying would be time-consuming
|
||||||
|
and error-prone. With a header file, the related declarations appear
|
||||||
|
in only one place. If they need to be changed, they can be changed in one
|
||||||
|
place, and programs that include the header file will automatically use the
|
||||||
|
new version when next recompiled. The header file eliminates the labor of
|
||||||
|
finding and changing all the copies as well as the risk that a failure to
|
||||||
|
find one copy will result in inconsistencies within a program.
|
||||||
|
|
||||||
|
In C, the usual convention is to give header files names that end with `.h'.
|
||||||
|
It is most portable to use only letters, digits, dashes, and underscores in
|
||||||
|
header file names, and at most one dot.
|
||||||
|
|
||||||
|
Read more about using header files in official GCC documentation:
|
||||||
|
|
||||||
|
* Include Syntax
|
||||||
|
* Include Operation
|
||||||
|
* Once-Only Headers
|
||||||
|
* Computed Includes
|
||||||
|
|
||||||
|
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
|
||||||
46
lib/README
Normal file
46
lib/README
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
|
||||||
|
This directory is intended for project specific (private) libraries.
|
||||||
|
PlatformIO will compile them to static libraries and link into executable file.
|
||||||
|
|
||||||
|
The source code of each library should be placed in a an own separate directory
|
||||||
|
("lib/your_library_name/[here are source files]").
|
||||||
|
|
||||||
|
For example, see a structure of the following two libraries `Foo` and `Bar`:
|
||||||
|
|
||||||
|
|--lib
|
||||||
|
| |
|
||||||
|
| |--Bar
|
||||||
|
| | |--docs
|
||||||
|
| | |--examples
|
||||||
|
| | |--src
|
||||||
|
| | |- Bar.c
|
||||||
|
| | |- Bar.h
|
||||||
|
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
|
||||||
|
| |
|
||||||
|
| |--Foo
|
||||||
|
| | |- Foo.c
|
||||||
|
| | |- Foo.h
|
||||||
|
| |
|
||||||
|
| |- README --> THIS FILE
|
||||||
|
|
|
||||||
|
|- platformio.ini
|
||||||
|
|--src
|
||||||
|
|- main.c
|
||||||
|
|
||||||
|
and a contents of `src/main.c`:
|
||||||
|
```
|
||||||
|
#include <Foo.h>
|
||||||
|
#include <Bar.h>
|
||||||
|
|
||||||
|
int main (void)
|
||||||
|
{
|
||||||
|
...
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
PlatformIO Library Dependency Finder will find automatically dependent
|
||||||
|
libraries scanning project source files.
|
||||||
|
|
||||||
|
More information about PlatformIO Library Dependency Finder
|
||||||
|
- https://docs.platformio.org/page/librarymanager/ldf.html
|
||||||
20
platformio.ini
Normal file
20
platformio.ini
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
; PlatformIO Project Configuration File
|
||||||
|
;
|
||||||
|
; Build options: build flags, source filter
|
||||||
|
; Upload options: custom upload port, speed and extra flags
|
||||||
|
; Library options: dependencies, extra library storages
|
||||||
|
; Advanced options: extra scripting
|
||||||
|
;
|
||||||
|
; Please visit documentation for the other options and examples
|
||||||
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
|
[env:esp32doit-devkit-v1]
|
||||||
|
platform = espressif32
|
||||||
|
board = esp32doit-devkit-v1
|
||||||
|
framework = arduino
|
||||||
|
lib_deps =
|
||||||
|
adafruit/Adafruit SSD1306@^2.4.0
|
||||||
|
bblanchon/ArduinoJson@^6.19.4
|
||||||
|
lucadentella/TOTP library@^1.1.0
|
||||||
|
arduino-libraries/NTPClient@^3.2.1
|
||||||
|
lib_ldf_mode = chain+
|
||||||
264
src/main.cpp
Normal file
264
src/main.cpp
Normal file
@@ -0,0 +1,264 @@
|
|||||||
|
// The codes that are displayed are not consistent with the GOOGLE Authenticator
|
||||||
|
// app.... I guess that TOTP library has an issue...
|
||||||
|
|
||||||
|
// I connected SCL to D22 and SDA to D21
|
||||||
|
|
||||||
|
#include <Adafruit_GFX.h>
|
||||||
|
#include <Adafruit_I2CDevice.h>
|
||||||
|
#include <Adafruit_SSD1306.h>
|
||||||
|
#include <Arduino.h>
|
||||||
|
#include <ArduinoJson.h>
|
||||||
|
#include <ESPmDNS.h>
|
||||||
|
#include <NTPClient.h>
|
||||||
|
#include <Update.h>
|
||||||
|
#include <WebServer.h>
|
||||||
|
#include <WiFi.h>
|
||||||
|
#include <WiFiUdp.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
#include <uri/UriBraces.h>
|
||||||
|
|
||||||
|
#include "TOTP.h"
|
||||||
|
#include "sha1.h"
|
||||||
|
|
||||||
|
WiFiUDP ntpUDP;
|
||||||
|
NTPClient timeClient(ntpUDP);
|
||||||
|
|
||||||
|
uint8_t hmacKey[] = {0x62, 0x27, 0x2F, 0x33, 0x54, 0x79, 0x4A,
|
||||||
|
0x69, 0x79, 0x2B, 0x74, 0x66, 0x27};
|
||||||
|
|
||||||
|
TOTP totp = TOTP(hmacKey, 12);
|
||||||
|
char code[7];
|
||||||
|
|
||||||
|
unsigned long lastMsg = 0;
|
||||||
|
#define MSG_BUFFER_SIZE (50)
|
||||||
|
char msg[MSG_BUFFER_SIZE];
|
||||||
|
|
||||||
|
const char* host = "esp32oled";
|
||||||
|
const char* ssid = "JoNelsDarlings";
|
||||||
|
const char* password = "Paris2016";
|
||||||
|
|
||||||
|
WebServer server(80);
|
||||||
|
|
||||||
|
// Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
|
||||||
|
#define SCREEN_WIDTH 128 // OLED display width, in pixels
|
||||||
|
#define SCREEN_HEIGHT 64 // OLED display height, in pixels
|
||||||
|
|
||||||
|
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, -1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Login page
|
||||||
|
*/
|
||||||
|
|
||||||
|
const char* loginIndex =
|
||||||
|
"<form name='loginForm'>"
|
||||||
|
"<table width='20%' bgcolor='A09F9F' align='center'>"
|
||||||
|
"<tr>"
|
||||||
|
"<td colspan=2>"
|
||||||
|
"<center><font size=4><b>ESP32 Login Page</b></font></center>"
|
||||||
|
"<br>"
|
||||||
|
"</td>"
|
||||||
|
"<br>"
|
||||||
|
"<br>"
|
||||||
|
"</tr>"
|
||||||
|
"<td>Username:</td>"
|
||||||
|
"<td><input type='text' size=25 name='userid'><br></td>"
|
||||||
|
"</tr>"
|
||||||
|
"<br>"
|
||||||
|
"<br>"
|
||||||
|
"<tr>"
|
||||||
|
"<td>Password:</td>"
|
||||||
|
"<td><input type='Password' size=25 name='pwd'><br></td>"
|
||||||
|
"<br>"
|
||||||
|
"<br>"
|
||||||
|
"</tr>"
|
||||||
|
"<tr>"
|
||||||
|
"<td><input type='submit' onclick='check(this.form)' value='Login'></td>"
|
||||||
|
"</tr>"
|
||||||
|
"</table>"
|
||||||
|
"</form>"
|
||||||
|
"<script>"
|
||||||
|
"function check(form)"
|
||||||
|
"{"
|
||||||
|
"if(form.userid.value=='admin' && form.pwd.value=='admin')"
|
||||||
|
"{"
|
||||||
|
"window.open('/serverIndex')"
|
||||||
|
"}"
|
||||||
|
"else"
|
||||||
|
"{"
|
||||||
|
" alert('Error Password or Username')/*displays error message*/"
|
||||||
|
"}"
|
||||||
|
"}"
|
||||||
|
"</script>";
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Server Index Page
|
||||||
|
*/
|
||||||
|
|
||||||
|
const char* serverIndex =
|
||||||
|
"<script "
|
||||||
|
"src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></"
|
||||||
|
"script>"
|
||||||
|
"<form method='POST' action='#' enctype='multipart/form-data' "
|
||||||
|
"id='upload_form'>"
|
||||||
|
"<input type='file' name='update'>"
|
||||||
|
"<input type='submit' value='Update'>"
|
||||||
|
"</form>"
|
||||||
|
"<div id='prg'>progress: 0%</div>"
|
||||||
|
"<script>"
|
||||||
|
"$('form').submit(function(e){"
|
||||||
|
"e.preventDefault();"
|
||||||
|
"var form = $('#upload_form')[0];"
|
||||||
|
"var data = new FormData(form);"
|
||||||
|
" $.ajax({"
|
||||||
|
"url: '/update',"
|
||||||
|
"type: 'POST',"
|
||||||
|
"data: data,"
|
||||||
|
"contentType: false,"
|
||||||
|
"processData:false,"
|
||||||
|
"xhr: function() {"
|
||||||
|
"var xhr = new window.XMLHttpRequest();"
|
||||||
|
"xhr.upload.addEventListener('progress', function(evt) {"
|
||||||
|
"if (evt.lengthComputable) {"
|
||||||
|
"var per = evt.loaded / evt.total;"
|
||||||
|
"$('#prg').html('progress: ' + Math.round(per*100) + '%');"
|
||||||
|
"}"
|
||||||
|
"}, false);"
|
||||||
|
"return xhr;"
|
||||||
|
"},"
|
||||||
|
"success:function(d, s) {"
|
||||||
|
"console.log('success!')"
|
||||||
|
"},"
|
||||||
|
"error: function (a, b, c) {"
|
||||||
|
"}"
|
||||||
|
"});"
|
||||||
|
"});"
|
||||||
|
"</script>";
|
||||||
|
|
||||||
|
void writeToOled(String text) {
|
||||||
|
display.clearDisplay();
|
||||||
|
display.setTextColor(WHITE);
|
||||||
|
display.setCursor(0, 0);
|
||||||
|
display.setTextSize(2);
|
||||||
|
display.print(text);
|
||||||
|
display.display();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* setup function
|
||||||
|
*/
|
||||||
|
void setup(void) {
|
||||||
|
Serial.begin(9600);
|
||||||
|
delay(2000);
|
||||||
|
|
||||||
|
Serial.println("STARTUP");
|
||||||
|
if (!display.begin(SSD1306_SWITCHCAPVCC, 0x3C)) { // Address 0x3D for 128x64
|
||||||
|
Serial.println(F("SSD1306 allocation failed"));
|
||||||
|
for (;;)
|
||||||
|
;
|
||||||
|
}
|
||||||
|
delay(2000);
|
||||||
|
|
||||||
|
writeToOled("Startup");
|
||||||
|
|
||||||
|
randomSeed(micros());
|
||||||
|
// Connect to WiFi network
|
||||||
|
WiFi.begin(ssid, password);
|
||||||
|
Serial.println("");
|
||||||
|
|
||||||
|
// Wait for connection or reboot if it doesn't connect for too long
|
||||||
|
uint32_t wifiConnAttements = 0;
|
||||||
|
while (WiFi.status() != WL_CONNECTED) {
|
||||||
|
delay(500);
|
||||||
|
Serial.print(".");
|
||||||
|
if (wifiConnAttements++ > 120) {
|
||||||
|
Serial.println(
|
||||||
|
"<Wifi not connecting after 120 attmepts (1 min.) - rebooting>");
|
||||||
|
ESP.restart();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Serial.println("");
|
||||||
|
Serial.print("Connected to ");
|
||||||
|
Serial.println(ssid);
|
||||||
|
Serial.print("IP address: ");
|
||||||
|
Serial.println(WiFi.localIP());
|
||||||
|
|
||||||
|
/*use mdns for host name resolution*/
|
||||||
|
if (!MDNS.begin(host)) { // http://esp32ota.local
|
||||||
|
Serial.println("Error setting up MDNS responder!");
|
||||||
|
while (1) {
|
||||||
|
delay(1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Serial.println("mDNS responder started");
|
||||||
|
/*return index page which is stored in serverIndex */
|
||||||
|
server.on("/", HTTP_GET, []() {
|
||||||
|
server.sendHeader("Connection", "close");
|
||||||
|
server.send(200, "text/html", loginIndex);
|
||||||
|
});
|
||||||
|
server.on("/serverIndex", HTTP_GET, []() {
|
||||||
|
server.sendHeader("Connection", "close");
|
||||||
|
server.send(200, "text/html", serverIndex);
|
||||||
|
});
|
||||||
|
server.on(UriBraces("/oled/{}"), HTTP_GET, []() {
|
||||||
|
server.sendHeader("Connection", "close");
|
||||||
|
String text = server.pathArg(0);
|
||||||
|
writeToOled(text);
|
||||||
|
server.send(200, "text/html", text);
|
||||||
|
});
|
||||||
|
server.on("/oled", HTTP_POST, []() {
|
||||||
|
server.sendHeader("Connection", "close");
|
||||||
|
String text = server.arg(0);
|
||||||
|
writeToOled(text);
|
||||||
|
server.send(200, "text/html", text);
|
||||||
|
});
|
||||||
|
/*handling uploading firmware file */
|
||||||
|
server.on(
|
||||||
|
"/update", HTTP_POST,
|
||||||
|
[]() {
|
||||||
|
server.sendHeader("Connection", "close");
|
||||||
|
server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
|
||||||
|
ESP.restart();
|
||||||
|
},
|
||||||
|
[]() {
|
||||||
|
HTTPUpload& upload = server.upload();
|
||||||
|
if (upload.status == UPLOAD_FILE_START) {
|
||||||
|
Serial.printf("Update: %s\n", upload.filename.c_str());
|
||||||
|
if (!Update.begin(
|
||||||
|
UPDATE_SIZE_UNKNOWN)) { // start with max available size
|
||||||
|
Update.printError(Serial);
|
||||||
|
}
|
||||||
|
} else if (upload.status == UPLOAD_FILE_WRITE) {
|
||||||
|
/* flashing firmware to ESP*/
|
||||||
|
if (Update.write(upload.buf, upload.currentSize) !=
|
||||||
|
upload.currentSize) {
|
||||||
|
Update.printError(Serial);
|
||||||
|
}
|
||||||
|
} else if (upload.status == UPLOAD_FILE_END) {
|
||||||
|
if (Update.end(
|
||||||
|
true)) { // true to set the size to the current progress
|
||||||
|
Serial.printf("Update Success: %u\nRebooting...\n",
|
||||||
|
upload.totalSize);
|
||||||
|
} else {
|
||||||
|
Update.printError(Serial);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
server.begin();
|
||||||
|
timeClient.begin();
|
||||||
|
writeToOled("Ready.");
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop(void) {
|
||||||
|
timeClient.update();
|
||||||
|
server.handleClient();
|
||||||
|
delay(1000);
|
||||||
|
|
||||||
|
writeToOled(timeClient.getFormattedTime());
|
||||||
|
char* newCode = totp.getCode(timeClient.getEpochTime());
|
||||||
|
if (strcmp(code, newCode) != 0) {
|
||||||
|
strcpy(code, newCode);
|
||||||
|
writeToOled(code);
|
||||||
|
delay(5000);
|
||||||
|
}
|
||||||
|
}
|
||||||
11
test/README
Normal file
11
test/README
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
This directory is intended for PlatformIO Unit Testing and project tests.
|
||||||
|
|
||||||
|
Unit Testing is a software testing method by which individual units of
|
||||||
|
source code, sets of one or more MCU program modules together with associated
|
||||||
|
control data, usage procedures, and operating procedures, are tested to
|
||||||
|
determine whether they are fit for use. Unit testing finds problems early
|
||||||
|
in the development cycle.
|
||||||
|
|
||||||
|
More information about PlatformIO Unit Testing:
|
||||||
|
- https://docs.platformio.org/page/plus/unit-testing.html
|
||||||
Reference in New Issue
Block a user