aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md15
-rw-r--r--include/Response.hpp5
-rw-r--r--src/Response.cpp107
-rw-r--r--src/SimpleHandlers.cpp30
-rw-r--r--src/main.cpp3
5 files changed, 155 insertions, 5 deletions
diff --git a/README.md b/README.md
index 22f8a05..ea08283 100644
--- a/README.md
+++ b/README.md
@@ -64,10 +64,23 @@ No extra content.
The text should be printed underlined.
No extra content.
+##### `attachment`
+The text is the caption of an attached file.
+Extra content: an `attachment`-object. (TODO: extend to array of attachments)
+
##### `command`
-The text should be formated in a way to underlying platform of the bridge would recognize it (e.g. prefix with '/').
+The text should be formatted in a way to underlying platform of the bridge would recognize it (e.g. prefix with '/').
Extra content: the description of the command.
##### `link`
The text should be formatted as a link.
Extra content: the alt text for the uri - the uri should be the text itself, so that clients ignoring this annotation still show the real uri.
+
+#### `attachment`
+The `attachment` object:
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `type` | string | MIME type of the attachment (e.g. "png", "gif", etc) |
+| `name` | string | The name of the file (including the file ending) |
+| `content` | string | Base64 encoded file contents | \ No newline at end of file
diff --git a/include/Response.hpp b/include/Response.hpp
index 82edb53..3e42d0d 100644
--- a/include/Response.hpp
+++ b/include/Response.hpp
@@ -11,6 +11,11 @@ namespace Response {
// create a full response of just plain text
json simple_response(std::string const &text, std::string const &session = "null", bool success = true);
+ // create file attachment (is an annotation)
+ json create_attachment(std::string const &file_path);
+ json create_attachment(std::string const &file_path, std::string const &file_name);
+ json create_attachment(std::string const &file_path, std::string const &file_name, std::string const &file_type);
+
// "nested" annotations: the extra field is again an array of text-annotation pairs
json create_annotation(AnnotationType annotation, std::vector<json> &&extra);
// construct an extra field with no special annotations in the extra
diff --git a/src/Response.cpp b/src/Response.cpp
index 286de52..d97ab40 100644
--- a/src/Response.cpp
+++ b/src/Response.cpp
@@ -44,4 +44,109 @@ Response::json Response::create_response(std::vector<json> &&reply, std::string
response["session"] = session;
response["reply"] = std::move(reply);
return response;
-} \ No newline at end of file
+}
+
+static std::string const base64_chars =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789+/";
+
+std::string base64_encode(unsigned char const *input, unsigned int const len) {
+ std::string ret;
+ size_t i = 0;
+ unsigned char bytes[3];
+ unsigned char sextets[4];
+
+ while (i <= (len - 3)) {
+ bytes[0] = *(input++);
+ bytes[1] = *(input++);
+ bytes[2] = *(input++);
+
+ sextets[0] = (bytes[0] & 0xfc) >> 2; // Cuts last two bits off of first byte
+ sextets[1] = ((bytes[0] & 0x03) << 4) + ((bytes[1] & 0xf0)
+ >> 4); // Takes last two bits from first byte and adds it to first 4 bits of 2nd byte
+ sextets[2] = ((bytes[1] & 0x0f) << 2) + ((bytes[2] & 0xc0)
+ >> 6); // Takes last 4 bits of 2nd byte and adds it to first 2 bits of third byte
+ sextets[3] = bytes[2] & 0x3f; // takes last 6 bits of third byte
+
+ for (size_t j = 0; j < 4; ++j) {
+ ret += base64_chars[sextets[j]];
+ }
+
+ i += 3; // increases to go to third byte
+ }
+
+ if (i != len) {
+ size_t k = 0;
+ size_t j = len - i; // Find index of last byte
+ while (k < j) { // Sets first bytes
+ bytes[k] = *(input++);
+ ++k;
+ }
+
+ while (j < 3) { // Set last bytes to 0x00
+ bytes[j] = '\0';
+ ++j;
+ }
+
+ sextets[0] = (bytes[0] & 0xfc) >> 2; // Cuts last two bits off of first byte
+ sextets[1] = ((bytes[0] & 0x03) << 4) + ((bytes[1] & 0xf0)
+ >> 4); // Takes last two bits from first byte and adds it to first 4 bits of 2nd byte
+ sextets[2] = ((bytes[1] & 0x0f) << 2) + ((bytes[2] & 0xc0)
+ >> 6); // Takes last 4 bits of 2nd byte and adds it to first 2 bits of third byte
+ // No last one is needed, because if there were 4, then (i == len) == true
+
+ for (j = 0; j < (len - i) + 1; ++j) { // Gets sextets that include data
+ ret += base64_chars[sextets[j]]; // Appends them to string
+ }
+
+ while ((j++) < 4) // Appends remaining ='s
+ ret += '=';
+
+ }
+
+ return ret;
+}
+
+std::string base64_encode_file(std::string const &path) {
+ std::vector<char> temp;
+
+ std::ifstream infile;
+ infile.open(path, std::ios::binary); // Open file in binary mode
+ if (infile.is_open()) {
+ while (!infile.eof()) {
+ char c = (char) infile.get();
+ temp.push_back(c);
+ }
+ infile.close();
+ } else return "File could not be opened";
+ std::string ret(temp.begin(), temp.end() - 1);
+ ret = base64_encode((unsigned const char *) ret.c_str(), ret.size());
+
+ return ret;
+}
+
+Response::json Response::create_attachment(std::string const &file_path) {
+ std::string name = file_path;
+ if (auto pos = file_path.find_last_of('/'); pos != std::string::npos) {
+ name = file_path.substr(pos + 1);
+ }
+ return create_attachment(file_path, name);
+}
+
+Response::json Response::create_attachment(std::string const &file_path, std::string const &file_name) {
+ std::string type = "unknown";
+ if (auto pos = file_name.find_last_of('.'); pos != std::string::npos) {
+ type = file_name.substr(pos + 1);
+ }
+ return create_attachment(file_path, file_name, type);
+}
+
+Response::json
+Response::create_attachment(std::string const &file_path, std::string const &file_name, std::string const &file_type) {
+ json attachment(crow::json::type::Object);
+ attachment["type"] = file_type;
+ attachment["name"] = file_name;
+ attachment["content"] = base64_encode_file(file_path);
+ return attachment;
+}
diff --git a/src/SimpleHandlers.cpp b/src/SimpleHandlers.cpp
index 0a4bdb1..d9c6448 100644
--- a/src/SimpleHandlers.cpp
+++ b/src/SimpleHandlers.cpp
@@ -2,11 +2,14 @@
#include "Response.hpp"
+#include <array>
#include <cctype>
+#include <memory>
#include <string>
-#include <fstream>
#include <iomanip>
#include <sstream>
+#include <iostream>
+#include <stdexcept>
using namespace Response;
@@ -113,7 +116,30 @@ std::string url_encode(std::string const &value) {
return escaped.str();
}
+
+std::string exec(const char* cmd) {
+ std::array<char, 128> buffer{};
+ std::string result;
+ std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
+ if (!pipe) {
+ throw std::runtime_error("popen() failed!");
+ }
+ while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
+ result += buffer.data();
+ }
+ return result;
+}
+
json Handler::latexRenderHandler(std::string const &arguments, std::string const &session, void *payload) {
(void) payload;
- return simple_response("https://latex.codecogs.com/png.latex?" + url_encode(arguments), session, true);
+
+ std::string file = exec("mktemp");
+
+ std::string result = exec(("curl -s 'https://latex.codecogs.com/png.latex?" + url_encode(arguments) + "' "
+ "-H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0' "
+ "-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' "
+ "-H 'Accept-Language: en-US,en;q=0.5' --compressed -H 'DNT: 1' -H 'Connection: keep-alive' "
+ "-H 'Upgrade-Insecure-Requests: 1' --output " + file).c_str());
+
+ return simple_response(result, session, true);
}
diff --git a/src/main.cpp b/src/main.cpp
index 2e215cd..8c6571f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,8 @@ int main() {
return createPlainDescriptionFromText(
"{adlershof, nord, sued} Shows the daily menu of the mensa at various places.");
}});
- Handler::CommandHandler{"latex", Handler::latexRenderHandler [createPlainDescriptionFromText]() {
+ regular_commands.emplace_back(
+ Handler::CommandHandler{"latex", Handler::latexRenderHandler, [createPlainDescriptionFromText]() {
return createPlainDescriptionFromText(
"Renders the given string to a png");
}});