aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Validate tinyurl

Browse Source
This commit is contained in:
James Booth 2012-07-29 01:12:39 +01:00
parent 45e2415b71
commit a16a7171f2
3 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/command.c
View File

@ -283,34 +283,23 @@ _cmd_msg(const char * const inp)
static gboolean
_cmd_tiny(const char * const inp)
{
char *usr = NULL;
char *msg = NULL;
char *url = strndup(inp+6, strlen(inp)-6);
jabber_conn_status_t conn_status = jabber_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
if (!tinyurl_valid(url)) {
GString *error = g_string_new("/tiny, badly formed URL: ");
g_string_append(error, url);
cons_bad_show(error->str);
g_string_free(error, TRUE);
} else if (win_in_chat()) {
char *tiny = tinyurl_get(url);
char *recipient = win_get_recipient();
jabber_send(tiny, recipient);
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
free(tiny);
free(url);
} else {
// copy input
char inp_cpy[strlen(inp) + 1];
strcpy(inp_cpy, inp);
// get user
strtok(inp_cpy, " ");
usr = strtok(NULL, " ");
if ((usr != NULL) && (strlen(inp) > (6 + strlen(usr) + 1))) {
// get message
msg = strndup(inp+6+strlen(usr)+1, strlen(inp)-(6+strlen(usr)+1));
if (msg != NULL) {
char *tinyurl = tinyurl_get(msg);
jabber_send(tinyurl, usr);
win_show_outgoing_msg("me", usr, tinyurl);
} else {
cons_show("Usage: /tiny user@host url");
}
} else {
cons_show("Usage: /tiny user@host url");
}
cons_bad_command(inp);
}
return TRUE;

7
src/tinyurl.c
View File

@ -41,6 +41,13 @@ tinyurl_init(void)
curl_global_init(CURL_GLOBAL_ALL);
}
gboolean
tinyurl_valid(char *url)
{
return (g_str_has_prefix(url, "http://") ||
g_str_has_prefix(url, "https://"));
}
char *
tinyurl_get(char *url)
{

1
src/tinyurl.h
View File

@ -21,4 +21,5 @@
*/
void tinyurl_init(void);
gboolean tinyurl_valid(char *url);
char * tinyurl_get(char *url);