mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-24 10:56:22 +00:00
Added pgp key list command
This commit is contained in:
@@ -848,6 +848,14 @@ static struct cmd_t command_defs[] =
|
||||
"Send chat state notifications during chat sessions.",
|
||||
NULL } } },
|
||||
|
||||
{ "/pgp",
|
||||
cmd_pgp, parse_args, 1, 1, NULL,
|
||||
{ "/pgp keys", "Open PGP.",
|
||||
{ "/pgp keys",
|
||||
"---------",
|
||||
"Open PGP.",
|
||||
NULL } } },
|
||||
|
||||
{ "/otr",
|
||||
cmd_otr, parse_args, 1, 3, NULL,
|
||||
{ "/otr command [args..]", "Off The Record encryption commands.",
|
||||
@@ -1202,6 +1210,7 @@ static Autocomplete time_statusbar_ac;
|
||||
static Autocomplete resource_ac;
|
||||
static Autocomplete inpblock_ac;
|
||||
static Autocomplete receipts_ac;
|
||||
static Autocomplete pgp_ac;
|
||||
|
||||
/*
|
||||
* Initialise command autocompleter and history
|
||||
@@ -1563,6 +1572,9 @@ cmd_init(void)
|
||||
receipts_ac = autocomplete_new();
|
||||
autocomplete_add(receipts_ac, "send");
|
||||
autocomplete_add(receipts_ac, "request");
|
||||
|
||||
pgp_ac = autocomplete_new();
|
||||
autocomplete_add(pgp_ac, "keys");
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1621,6 +1633,7 @@ cmd_uninit(void)
|
||||
autocomplete_free(resource_ac);
|
||||
autocomplete_free(inpblock_ac);
|
||||
autocomplete_free(receipts_ac);
|
||||
autocomplete_free(pgp_ac);
|
||||
}
|
||||
|
||||
gboolean
|
||||
@@ -1788,6 +1801,7 @@ cmd_reset_autocomplete()
|
||||
autocomplete_reset(resource_ac);
|
||||
autocomplete_reset(inpblock_ac);
|
||||
autocomplete_reset(receipts_ac);
|
||||
autocomplete_reset(pgp_ac);
|
||||
|
||||
if (ui_current_win_type() == WIN_CHAT) {
|
||||
ProfChatWin *chatwin = wins_get_current_chat();
|
||||
@@ -1971,8 +1985,8 @@ _cmd_complete_parameters(const char * const input)
|
||||
}
|
||||
}
|
||||
|
||||
gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/subject", "/room" };
|
||||
Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, subject_ac, room_ac };
|
||||
gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/subject", "/room", "/pgp" };
|
||||
Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, subject_ac, room_ac, pgp_ac };
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
|
||||
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);
|
||||
|
||||
@@ -56,6 +56,9 @@
|
||||
#ifdef HAVE_LIBOTR
|
||||
#include "otr/otr.h"
|
||||
#endif
|
||||
#ifdef HAVE_LIBGPGME
|
||||
#include "pgp/gpg.h"
|
||||
#endif
|
||||
#include "profanity.h"
|
||||
#include "tools/autocomplete.h"
|
||||
#include "tools/parser.h"
|
||||
@@ -4063,6 +4066,31 @@ cmd_xa(gchar **args, struct cmd_help_t help)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
cmd_pgp(gchar **args, struct cmd_help_t help)
|
||||
{
|
||||
#ifdef HAVE_LIBGPGME
|
||||
if (g_strcmp0(args[0], "keys") == 0) {
|
||||
GSList *keys = p_gpg_list_keys();
|
||||
if (keys) {
|
||||
while (keys) {
|
||||
cons_debug("Key: %s", keys->data);
|
||||
keys = g_slist_next(keys);
|
||||
}
|
||||
} else {
|
||||
cons_debug("No keys found");
|
||||
}
|
||||
g_slist_free_full(keys, (GDestroyNotify)free);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
#else
|
||||
cons_show("This version of Profanity has not been built with PGP support enabled");
|
||||
return TRUE;
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
gboolean
|
||||
cmd_otr(gchar **args, struct cmd_help_t help)
|
||||
{
|
||||
|
||||
@@ -103,6 +103,7 @@ gboolean cmd_nick(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_notify(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_online(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_otr(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_pgp(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_outtype(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_prefs(gchar **args, struct cmd_help_t help);
|
||||
gboolean cmd_priority(gchar **args, struct cmd_help_t help);
|
||||
|
||||
@@ -121,6 +121,12 @@ main(int argc, char **argv)
|
||||
g_print("OTR support: Disabled\n");
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBGPGME
|
||||
g_print("PGP support: Enabled\n");
|
||||
#else
|
||||
g_print("PGP support: Disabled\n");
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
81
src/pgp/gpg.c
Normal file
81
src/pgp/gpg.c
Normal file
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* gpg.c
|
||||
*
|
||||
* Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
|
||||
*
|
||||
* This file is part of Profanity.
|
||||
*
|
||||
* Profanity is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Profanity is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Profanity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In addition, as a special exception, the copyright holders give permission to
|
||||
* link the code of portions of this program with the OpenSSL library under
|
||||
* certain conditions as described in each individual source file, and
|
||||
* distribute linked combinations including the two.
|
||||
*
|
||||
* You must obey the GNU General Public License in all respects for all of the
|
||||
* code used other than OpenSSL. If you modify file(s) with this exception, you
|
||||
* may extend this exception to your version of the file(s), but you are not
|
||||
* obligated to do so. If you do not wish to do so, delete this exception
|
||||
* statement from your version. If you delete this exception statement from all
|
||||
* source files in the program, then also delete it here.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <locale.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gpgme.h>
|
||||
|
||||
#include "log.h"
|
||||
|
||||
void
|
||||
p_gpg_init(void)
|
||||
{
|
||||
char *version = gpgme_check_version (NULL);
|
||||
log_debug("GPG: Found gpgme version: %s",version);
|
||||
gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL));
|
||||
}
|
||||
|
||||
GSList *
|
||||
p_gpg_list_keys(void)
|
||||
{
|
||||
gpgme_error_t error;
|
||||
gpgme_ctx_t ctx;
|
||||
gpgme_key_t key;
|
||||
GSList *result = NULL;
|
||||
|
||||
error = gpgme_new(&ctx);
|
||||
if (error) {
|
||||
log_error("GPG: Could not list keys: %s %s", gpgme_strsource(error), gpgme_strerror(error));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
error = gpgme_op_keylist_start(ctx, NULL, 1);
|
||||
if (error == GPG_ERR_NO_ERROR) {
|
||||
while (!error) {
|
||||
error = gpgme_op_keylist_next(ctx, &key);
|
||||
if (error) {
|
||||
break;
|
||||
}
|
||||
result = g_slist_append(result, strdup(key->uids->uid));
|
||||
gpgme_key_release(key);
|
||||
}
|
||||
} else {
|
||||
log_error("GPG: Could not list keys: %s %s", gpgme_strsource(error), gpgme_strerror(error));
|
||||
}
|
||||
|
||||
gpgme_release(ctx);
|
||||
|
||||
return result;
|
||||
}
|
||||
41
src/pgp/gpg.h
Normal file
41
src/pgp/gpg.h
Normal file
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* gpg.h
|
||||
*
|
||||
* Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
|
||||
*
|
||||
* This file is part of Profanity.
|
||||
*
|
||||
* Profanity is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Profanity is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Profanity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In addition, as a special exception, the copyright holders give permission to
|
||||
* link the code of portions of this program with the OpenSSL library under
|
||||
* certain conditions as described in each individual source file, and
|
||||
* distribute linked combinations including the two.
|
||||
*
|
||||
* You must obey the GNU General Public License in all respects for all of the
|
||||
* code used other than OpenSSL. If you modify file(s) with this exception, you
|
||||
* may extend this exception to your version of the file(s), but you are not
|
||||
* obligated to do so. If you do not wish to do so, delete this exception
|
||||
* statement from your version. If you delete this exception statement from all
|
||||
* source files in the program, then also delete it here.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef GPG_H
|
||||
#define GPG_H
|
||||
|
||||
void p_gpg_init(void);
|
||||
GSList* p_gpg_list_keys(void);
|
||||
|
||||
#endif
|
||||
@@ -59,6 +59,9 @@
|
||||
#ifdef HAVE_LIBOTR
|
||||
#include "otr/otr.h"
|
||||
#endif
|
||||
#ifdef HAVE_LIBGPGME
|
||||
#include "pgp/gpg.h"
|
||||
#endif
|
||||
#include "resource.h"
|
||||
#include "xmpp/xmpp.h"
|
||||
#include "ui/ui.h"
|
||||
@@ -240,6 +243,9 @@ _init(const int disable_tls, char *log_level)
|
||||
muc_init();
|
||||
#ifdef HAVE_LIBOTR
|
||||
otr_init();
|
||||
#endif
|
||||
#ifdef HAVE_LIBGPGME
|
||||
p_gpg_init();
|
||||
#endif
|
||||
atexit(_shutdown);
|
||||
ui_input_nonblocking(TRUE);
|
||||
|
||||
Reference in New Issue
Block a user