Skip to content

hack to handle incoming files which come as an absolute path #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

hack to handle incoming files which come as an absolute path #255

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4b3454
hack to handle incoming files which come as an absolute path
dexterlb Dec 28, 2017
4985b6c
Merge branch 'master' into absolute_path_hack
dexterlb Feb 21, 2018
28b481a
Merge branch 'master' of github.com:SpectrumIM/spectrum2 into absolut…
dexterlb Mar 24, 2018
2a16c55
Merge branch 'master' into absolute_path_hack
dexterlb Apr 11, 2018
55a9c86
Merge branch 'master' of github.com:SpectrumIM/spectrum2 into absolut…
dexterlb May 20, 2018
5cc7275
Merge branch 'master' of github.com:SpectrumIM/spectrum2 into absolut…
dexterlb Jun 8, 2018
b70e97f
fix weird characters in URLs of uploaded files
dexterlb Jun 13, 2018
1fc7ec0
fix broken file extensions when uploading file via libpurple
dexterlb Jul 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
hack to handle incoming files which come as an absolute path
  • Loading branch information
@dexterlb
dexterlb committed Dec 28, 2017
commit e4b34548f6fe0fac11db01e298b80d5011987762
86 changes: 77 additions & 9 deletions backends/libpurple/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <boost/locale.hpp>
#include <boost/locale/conversion.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/regex.hpp>
#include <boost/filesystem.hpp>

#ifdef WITH_LIBEVENT
#include <event.h>
Expand Down Expand Up @@ -1222,6 +1224,61 @@ static char *calculate_data_hash(guchar *data, size_t len,
return g_strdup(digest);
}

static std::string check_incoming_document(const char *msg) {
/*
Sometimes, when a user sends a file, we receive a link with an absolute
path to the saved file in the backend's directory. This is a hack
which matches those links, moves the file to the web directory
and sends a proper link to the user.

This has to be fixed in the backend.
*/
if (strstr(msg, "[document") == NULL) {
return "";
}

static boost::regex document_expr("\[document <a href=[\"']file:///([^\"']+/download_([0-9]+)[^\"']+)[\"']>(.*)</a>[ ]*(.*)]");
boost::smatch match;
std::string plain;

if (!boost::regex_search(std::string(msg), match, document_expr)) {
return "";
}

std::string target_dir = CONFIG_STRING(config, "service.web_directory");
std::string local_file = match[1];
std::string hash = match[2];
std::string basename = match[3];
std::string file_type = match[4];

if (!target_dir.empty()) {
target_dir += "/" + hash; // todo: escape
std::string target_file = target_dir + "/" + basename;
std::string link = CONFIG_STRING(config, "service.web_url") + "/" + hash + "/" + basename;

boost::filesystem::create_directories(
boost::filesystem::path(target_dir)
);

boost::filesystem::rename(
boost::filesystem::path(local_file),
boost::filesystem::path(target_file)
);

plain
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove newline

= std::string("file ")
+ "\"" + basename + "\""
+ " of type ["
+ file_type
+ "]: "
+ link;
} else {
plain = "[received a file]";
}

return plain;
}

static void conv_write_im(PurpleConversation *conv, const char *who, const char *msg, PurpleMessageFlags flags, time_t mtime) {
// Don't forwards our own messages.
if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM && (flags & PURPLE_MESSAGE_SEND || flags & PURPLE_MESSAGE_SYSTEM)) {
Expand Down Expand Up @@ -1297,15 +1354,26 @@ static void conv_write_im(PurpleConversation *conv, const char *who, const char
g_free(strip);
}
else {
// Escape HTML characters.
char *newline = purple_strdup_withhtml_wrapped(msg);
char *strip, *xhtml;
purple_markup_html_to_xhtml_wrapped(newline, &xhtml, &strip);
message_ = strip;
xhtml_ = xhtml;
g_free(newline);
g_free(xhtml);
g_free(strip);
std::string file_link = check_incoming_document(msg);

if (!file_link.empty()) {
char *strip, *xhtml;
purple_markup_html_to_xhtml_wrapped(file_link.c_str(), &xhtml, &strip);
message_ = strip;
xhtml_ = xhtml;
g_free(xhtml);
g_free(strip);
} else {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a line break:

}
else {

// Escape HTML characters.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole section is not properly indented?

char *newline = purple_strdup_withhtml_wrapped(msg);
char *strip, *xhtml;
purple_markup_html_to_xhtml_wrapped(newline, &xhtml, &strip);
message_ = strip;
xhtml_ = xhtml;
g_free(newline);
g_free(xhtml);
g_free(strip);
}
}

// AIM and XMPP adds <body>...</body> here...
Expand Down