@ -7,7 +7,6 @@
# include <string> # include <string>
# include <sstream> # include <sstream>
# include <iomanip> # include <iomanip>
# include <mutex>
// Engine
// Engine
# include <pEp/key_reset.h> # include <pEp/key_reset.h>
@ -29,7 +28,8 @@
namespace pEp { namespace pEp {
namespace PythonAdapter { namespace PythonAdapter {
using namespace std ; using namespace std ;
using namespace boost : : python ; namespace bp = boost : : python ;
namespace bl = boost : : locale ;
static const char * version_string = " p≡p Python adapter version 0.3 " ; static const char * version_string = " p≡p Python adapter version 0.3 " ;
@ -103,9 +103,9 @@ void _throw_status(::PEP_STATUS status) {
try { try {
PyGILState_STATE gil = PyGILState_Ensure ( ) ; PyGILState_STATE gil = PyGILState_Ensure ( ) ;
pEpLog ( " GIL Aquired " ) ; pEpLog ( " GIL Aquired " ) ;
object modref = import ( " pEp " ) ; bp : : object modref = bp : : import ( " pEp " ) ;
object funcref = modref . attr ( " message_to_send " ) ; bp : : object funcref = modref . attr ( " message_to_send " ) ;
call < void > ( funcref . ptr ( ) , Message ( ) ) ; bp : : call < void > ( funcref . ptr ( ) , Message ( ) ) ;
PyGILState_Release ( gil ) ; PyGILState_Release ( gil ) ;
pEpLog ( " GIL released " ) ; pEpLog ( " GIL released " ) ;
} catch ( exception & e ) { } catch ( exception & e ) {
@ -119,9 +119,9 @@ void _throw_status(::PEP_STATUS status) {
try { try {
PyGILState_STATE gil = PyGILState_Ensure ( ) ; PyGILState_STATE gil = PyGILState_Ensure ( ) ;
pEpLog ( " GIL Aquired " ) ; pEpLog ( " GIL Aquired " ) ;
object modref = import ( " pEp " ) ; bp : : object modref = bp : : import ( " pEp " ) ;
object funcref = modref . attr ( " notify_handshake " ) ; bp : : object funcref = modref . attr ( " notify_handshake " ) ;
call < void > ( funcref . ptr ( ) , me , partner , signal ) ; bp : : call < void > ( funcref . ptr ( ) , me , partner , signal ) ;
PyGILState_Release ( gil ) ; PyGILState_Release ( gil ) ;
pEpLog ( " GIL released " ) ; pEpLog ( " GIL released " ) ;
} catch ( exception & e ) { } catch ( exception & e ) {
@ -154,9 +154,9 @@ void testfunc() {
_messageToSend ( NULL ) ; _messageToSend ( NULL ) ;
} }
void deliverHandshakeResult ( int result , object identities ) { void deliverHandshakeResult ( int result , bp : : object identities ) {
identity_list * shared_identities = nullptr ; identity_list * shared_identities = nullptr ;
if ( identities ! = boost : : python : : api : : object ( ) & & boost : : python : : len ( identities ) ) { if ( identities ! = bp : : api : : object ( ) & & boost : : python : : len ( identities ) ) {
shared_identities = : : new_identity_list ( nullptr ) ; shared_identities = : : new_identity_list ( nullptr ) ;
if ( ! shared_identities ) { if ( ! shared_identities ) {
throw bad_alloc ( ) ; throw bad_alloc ( ) ;
@ -164,8 +164,8 @@ void deliverHandshakeResult(int result, object identities) {
try { try {
: : identity_list * si = shared_identities ; : : identity_list * si = shared_identities ;
for ( int i = 0 ; i < boost : : python : : len ( identities ) ; + + i ) { for ( int i = 0 ; i < bp : : len ( identities ) ; + + i ) {
Identity ident = extract < Identity > ( identities [ i ] ) ; Identity ident = bp : : extract < Identity > ( identities [ i ] ) ;
si = : : identity_list_add ( si , ident ) ; si = : : identity_list_add ( si , ident ) ;
if ( ! si ) { if ( ! si ) {
throw bad_alloc ( ) ; throw bad_alloc ( ) ;
@ -182,42 +182,52 @@ void deliverHandshakeResult(int result, object identities) {
_throw_status ( status ) ; _throw_status ( status ) ;
} }
BOOST_PYTHON_MODULE ( _pEp ) { BOOST_PYTHON_MODULE ( _pEp ) {
using boost : : python : : def ;
using boost : : python : : class_ ;
using boost : : python : : enum_ ;
init_before_main_module ( ) ; init_before_main_module ( ) ;
// Module init function called by pEp.init()
// Module init function called by pEp.init()
def ( " _init_after_main_module " , _init_after_main_module ) ; def ( " _init_after_main_module " , _init_after_main_module ) ;
def ( " testfunc " , & testfunc ) ; def ( " testfunc " , & testfunc ) ;
docstring_options doc_options ( true , false , false ) ; bp : : docstring_options doc_options ( true , false , false ) ;
boost : : locale : : generator gen ; bl : : generator gen ;
std : : locale : : global ( gen ( " " ) ) ; std : : locale : : global ( gen ( " " ) ) ;
scope ( ) . attr ( " about " ) = about ( ) ;
scope ( ) . attr ( " per_user_directory " ) = : : per_user_directory ( ) ;
scope ( ) . attr ( " per_machine_directory " ) = : : per_machine_directory ( ) ;
scope ( ) . attr ( " engine_version " ) = : : get_engine_version ( ) ;
scope ( ) . attr ( " protocol_version " ) = : : get_protocol_version ( ) ;
def ( " passive_mode " , config_passive_mode , " do not attach pub keys to all messages " ) ; bp : : scope ( ) . attr ( " about " ) = about ( ) ;
bp : : scope ( ) . attr ( " per_user_directory " ) = : : per_user_directory ( ) ;
bp : : scope ( ) . attr ( " per_machine_directory " ) = : : per_machine_directory ( ) ;
bp : : scope ( ) . attr ( " engine_version " ) = : : get_engine_version ( ) ;
bp : : scope ( ) . attr ( " protocol_version " ) = : : get_protocol_version ( ) ;
def ( " unencrypted_subject " , config_unencrypted_subject , " do not encrypt the subject of messages " ) ; def ( " passive_mode " , config_passive_mode ,
" do not attach pub keys to all messages " ) ;
def ( " key_reset " , key_reset_user , " reset the default database status for the user / keypair provided \n " def ( " unencrypted_subject " , config_unencrypted_subject ,
" do not encrypt the subject of messages " ) ;
def ( " key_reset " , key_reset_user ,
" reset the default database status for the user / keypair provided \n "
" This will effectively perform key_reset on each identity \n " " This will effectively perform key_reset on each identity \n "
" associated with the key and user_id, if a key is provided, and for \n " " associated with the key and user_id, if a key is provided, and for \n "
" each key (and all of their identities) if an fpr is not. " ) ; " each key (and all of their identities) if an fpr is not. " ) ;
def ( " key_reset " , key_reset_user2 , " reset the default database status for the user / keypair provided \n " def ( " key_reset " , key_reset_user2 ,
" reset the default database status for the user / keypair provided \n "
" This will effectively perform key_reset on each identity \n " " This will effectively perform key_reset on each identity \n "
" associated with the key and user_id, if a key is provided, and for \n " " associated with the key and user_id, if a key is provided, and for \n "
" each key (and all of their identities) if an fpr is not. " ) ; " each key (and all of their identities) if an fpr is not. " ) ;
def ( " key_reset_all_own_keys " , key_reset_all_own_keys , " revoke and mistrust all own keys, generate new keys for all \n " def ( " key_reset_all_own_keys " , key_reset_all_own_keys ,
" revoke and mistrust all own keys, generate new keys for all \n "
" own identities, and opportunistically communicate key reset \n " " own identities, and opportunistically communicate key reset \n "
" information to people we have recently contacted. " ) ; " information to people we have recently contacted. " ) ;
auto identity_class = class_ < Identity > ( " Identity " , " Identity(address, username, user_id='', fpr='', comm_type=0, lang='en') \n " auto identity_class = class_ < Identity > ( " Identity " ,
" Identity(address, username, user_id='', fpr='', comm_type=0, lang='en') \n "
" \n " " \n "
" represents a p≡p identity \n " " represents a p≡p identity \n "
" \n " " \n "
@ -231,16 +241,30 @@ BOOST_PYTHON_MODULE (_pEp) {
" hex encoded \n " " hex encoded \n "
" comm_type first rating level of this communication channel \n " " comm_type first rating level of this communication channel \n "
" lang ISO 639-1 language code for language being preferred \n " " lang ISO 639-1 language code for language being preferred \n "
" on this communication channel \n " ) . def ( boost : : python : : init < string > ( ) ) . def ( boost : : python : : init < string , string > ( ) ) . def ( boost : : python : : init < string , string , string > ( ) ) . def ( boost : : python : : init < string , string , string , string > ( ) ) " on this communication channel \n "
. def ( boost : : python : : init < string , string , string , string , int > ( ) ) . def ( boost : : python : : init < string , string , string , string , int , string > ( ) ) . def ( " __repr__ " , & Identity : : _repr ) . def ( " __str__ " , & Identity : : _str , " string representation of this identity \n " )
" following the pattern 'username < address >' \n " ) . def ( bp : : init < string > ( ) )
. def ( " key_reset " , & Identity : : key_reset , boost : : python : : arg ( " fpr " ) = object ( " " ) , " reset the default database status for the identity / keypair provided. If this \n " . def ( bp : : init < string , string > ( ) )
. def ( bp : : init < string , string , string > ( ) )
. def ( bp : : init < string , string , string , string > ( ) )
. def ( bp : : init < string , string , string , string , int > ( ) )
. def ( bp : : init < string , string , string , string , int , string > ( ) )
. def ( " __repr__ " , & Identity : : _repr )
. def ( " __str__ " , & Identity : : _str ,
" string representation of this identity \n "
" following the pattern 'username < address >' \n "
)
. def ( " key_reset " , & Identity : : key_reset ,
bp : : arg ( " fpr " ) = bp : : object ( " " ) ,
" reset the default database status for the identity / keypair provided. If this \n "
" corresponds to the own user and a private key, also revoke the key, generate a \n " " corresponds to the own user and a private key, also revoke the key, generate a \n "
" new one, and communicate the reset to recently contacted pEp partners for this \n " " new one, and communicate the reset to recently contacted pEp partners for this \n "
" identity. If it does not, remove the key from the keyring; the key's status is \n " " identity. If it does not, remove the key from the keyring; the key's status is \n "
" completely fresh on next contact from the partner. " ) " completely fresh on next contact from the partner. " )
. def ( " key_mistrusted " , & Identity : : key_mistrusted , boost : : python : : arg ( " fpr " ) = object ( " " ) , " If you want updated trust on the identity, you ll have " . def ( " key_mistrusted " , & Identity : : key_mistrusted ,
bp : : arg ( " fpr " ) = bp : : object ( " " ) ,
" If you want updated trust on the identity, you ll have "
" to call update_identity or myself respectively after this. " " to call update_identity or myself respectively after this. "
" N.B. If you are calling this on a key that is the identity or user default, " " N.B. If you are calling this on a key that is the identity or user default, "
" it will be removed as the default key for ANY identity and user for which " " it will be removed as the default key for ANY identity and user for which "
@ -248,40 +272,79 @@ BOOST_PYTHON_MODULE (_pEp) {
" will only undo the current identity's / it's user's default, not any " " will only undo the current identity's / it's user's default, not any "
" other identities which may be impacted (this will not affect most use cases) " ) " other identities which may be impacted (this will not affect most use cases) " )
. def ( " enable_for_sync " , & Identity : : enable_for_sync , " Enable own identity for p≡p sync. \n \n " . def ( " enable_for_sync " , & Identity : : enable_for_sync ,
" Only use this on own identities, which are used as accounts. \n " ) . def ( " disable_for_sync " , & Identity : : disable_for_sync , " Disable own identity for p≡p sync. \n \n " " Enable own identity for p≡p sync. \n \n "
" Only use this on own identities, which are used as accounts. \n " )
. def ( " disable_for_sync " , & Identity : : disable_for_sync ,
" Disable own identity for p≡p sync. \n \n "
" Only use this on own identities, which are used as accounts. \n " ) " Only use this on own identities, which are used as accounts. \n " )
. add_property ( " address " , ( string ( Identity : : * ) ( ) ) & Identity : : address , ( void ( Identity : : * ) ( string ) ) & Identity : : address , " email address or URI " ) . add_property ( " fpr " , ( string ( Identity : : * ) ( ) ) & Identity : : fpr , ( void ( Identity : : * ) ( string ) ) & Identity : : fpr , " key ID (full fingerprint, hex encoded) " ) . add_property ( " address " , ( string ( Identity : : * ) ( ) ) & Identity : : address ,
. add_property ( " user_id " , ( string ( Identity : : * ) ( ) ) & Identity : : user_id , ( void ( Identity : : * ) ( string ) ) & Identity : : user_id , " ID of person associated or 'pEp_own_userId' if own identity " ) ( void ( Identity : : * ) ( string ) ) & Identity : : address ,
. add_property ( " username " , ( string ( Identity : : * ) ( ) ) & Identity : : username , ( void ( Identity : : * ) ( string ) ) & Identity : : username , " name in full of person associated " ) " email address or URI " )
. add_property ( " comm_type " , ( int ( Identity : : * ) ( ) ) ( PEP_comm_type ( Identity : : * ) ( ) ) & Identity : : comm_type , ( void ( Identity : : * ) ( int ) ) ( void ( Identity : : * ) ( : : PEP_comm_type ) ) & Identity : : comm_type , " communication type, first rating level (p≡p internal) " ) . add_property ( " fpr " , ( string ( Identity : : * ) ( ) ) & Identity : : fpr ,
. add_property ( " lang " , ( string ( Identity : : * ) ( ) ) & Identity : : lang , ( void ( Identity : : * ) ( string ) ) & Identity : : lang , " ISO 639-1 language code " ) . add_property ( " flags " , ( identity_flags_t ( Identity : : * ) ( ) ) & Identity : : flags , ( void ( Identity : : * ) ( : : identity_flags_t ) ) & Identity : : flags , " flags (p≡p internal) " ) ( void ( Identity : : * ) ( string ) ) & Identity : : fpr ,
. add_property ( " rating " , & Identity : : rating , " rating of Identity " ) . add_property ( " color " , & Identity : : color , " color of Identity as PEP_color " ) . add_property ( " is_pEp_user " , & Identity : : is_pEp_user , " True if this is an identity of a pEp user " ) . def ( " __deepcopy__ " , & Identity : : deepcopy ) " key ID (full fingerprint, hex encoded) " )
. def ( " update " , & Identity : : update , " update Identity " ) . def ( " __copy__ " , & Identity : : copy ) ; . add_property ( " user_id " , ( string ( Identity : : * ) ( ) ) & Identity : : user_id ,
( void ( Identity : : * ) ( string ) ) & Identity : : user_id ,
" ID of person associated or 'pEp_own_userId' if own identity " )
. add_property ( " username " , ( string ( Identity : : * ) ( ) ) & Identity : : username ,
( void ( Identity : : * ) ( string ) ) & Identity : : username ,
" name in full of person associated " )
. add_property ( " comm_type " , ( int ( Identity : : * ) ( ) )
( PEP_comm_type ( Identity : : * ) ( ) ) & Identity : : comm_type ,
( void ( Identity : : * ) ( int ) )
( void ( Identity : : * ) ( : : PEP_comm_type ) ) & Identity : : comm_type ,
" communication type, first rating level (p≡p internal) " )
. add_property ( " lang " , ( string ( Identity : : * ) ( ) ) & Identity : : lang ,
( void ( Identity : : * ) ( string ) ) & Identity : : lang ,
" ISO 639-1 language code " )
. add_property ( " flags " , ( identity_flags_t ( Identity : : * ) ( ) ) & Identity : : flags ,
( void ( Identity : : * ) ( : : identity_flags_t ) ) & Identity : : flags ,
" flags (p≡p internal) " )
. add_property ( " rating " , & Identity : : rating , " rating of Identity " )
. add_property ( " color " , & Identity : : color , " color of Identity as PEP_color " )
. add_property ( " is_pEp_user " , & Identity : : is_pEp_user , " True if this is an identity of a pEp user " )
. def ( " __deepcopy__ " , & Identity : : deepcopy )
. def ( " update " , & Identity : : update , " update Identity " )
. def ( " __copy__ " , & Identity : : copy ) ;
identity_class . attr ( " PEP_OWN_USERID " ) = " pEp_own_userId " ; identity_class . attr ( " PEP_OWN_USERID " ) = " pEp_own_userId " ;
auto blob_class = class_ < Message : : Blob > ( " Blob " , " Blob(data, mime_type='', filename='') \n " auto blob_class = class_ < Message : : Blob > ( " Blob " ,
" Blob(data, mime_type='', filename='') \n "
" \n " " \n "
" Binary large object \n " " Binary large object \n "
" \n " " \n "
" data bytes-like object \n " " data bytes-like object \n "
" mime_type MIME type for the data \n " " mime_type MIME type for the data \n "
" filename filename to store the data \n " , boost : : python : : init < object , char const * , char const * > ( args ( " data " , " mime_type " , " filename " ) ) ) . def ( boost : : python : : init < object , string > ( ) ) . def ( boost : : python : : init < object > ( ) ) " filename filename to store the data \n " ,
. def ( " __repr__ " , & Message : : Blob : : _repr ) . def ( " __len__ " , & Message : : Blob : : size , " size of Blob data in bytes " ) . def ( " decode " , ( string ( Message : : Blob : : * ) ( ) ) & Message : : Blob : : decode ) . def ( " decode " , ( string ( Message : : Blob : : * ) ( string ) ) & Message : : Blob : : decode , " text = blob.decode(encoding='') \n " bp : : init < bp : : object , char const * , char const * > ( bp : : args ( " data " , " mime_type " , " filename " ) ) )
. def ( bp : : init < bp : : object , string > ( ) )
. def ( bp : : init < bp : : object > ( ) )
. def ( " __repr__ " , & Message : : Blob : : _repr )
. def ( " __len__ " , & Message : : Blob : : size , " size of Blob data in bytes " )
. def ( " decode " , ( string ( Message : : Blob : : * ) ( ) ) & Message : : Blob : : decode )
. def ( " decode " , ( string ( Message : : Blob : : * ) ( string ) ) & Message : : Blob : : decode ,
" text = blob.decode(encoding='') \n "
" \n " " \n "
" decode Blob data into string depending on MIME type if encoding='' \n " " decode Blob data into string depending on MIME type if encoding='' \n "
" \n " " \n "
" mime_type='application/pEp.sync' decode as 'pEp.sync' \n " " mime_type='application/pEp.sync' decode as 'pEp.sync' \n "
" mime_type='application/pEp.keyreset' decode as 'pEp.keyreset' \n " " mime_type='application/pEp.keyreset' decode as 'pEp.keyreset' \n "
" other mime_type decode as 'ascii' by default \n " ) " other mime_type decode as 'ascii' by default \n "
. add_property ( " mime_type " , ( string ( Message : : Blob : : * ) ( ) ) & Message : : Blob : : mime_type , ( void ( Message : : Blob : : * ) ( string ) ) & Message : : Blob : : mime_type , " MIME type of object in Blob " ) )
. add_property ( " filename " , ( string ( Message : : Blob : : * ) ( ) ) & Message : : Blob : : filename , ( void ( Message : : Blob : : * ) ( string ) ) & Message : : Blob : : filename , " filename of object in Blob " ) ; . add_property ( " mime_type " , ( string ( Message : : Blob : : * ) ( ) ) & Message : : Blob : : mime_type ,
( void ( Message : : Blob : : * ) ( string ) ) & Message : : Blob : : mime_type ,
" MIME type of object in Blob " )
. add_property ( " filename " , ( string ( Message : : Blob : : * ) ( ) ) & Message : : Blob : : filename ,
( void ( Message : : Blob : : * ) ( string ) ) & Message : : Blob : : filename ,
" filename of object in Blob " ) ;
( ( PyTypeObject * ) ( void * ) blob_class . ptr ( ) ) - > tp_as_buffer = & Message : : Blob : : bp ; ( ( PyTypeObject * ) ( void * ) blob_class . ptr ( ) ) - > tp_as_buffer = & Message : : Blob : : bp ;
auto message_class = class_ < Message > ( " Message " , " Message(dir=1, from=None) \n " auto message_class = class_ < Message > ( " Message " ,
" Message(dir=1, from=None) \n "
" \n " " \n "
" new p≡p message \n " " new p≡p message \n "
" \n " " \n "
@ -292,28 +355,84 @@ BOOST_PYTHON_MODULE (_pEp) {
" \n " " \n "
" new incoming p≡p message \n " " new incoming p≡p message \n "
" \n " " \n "
" mime_text text in Multipurpose Internet Mail Extensions format \n " ) . def ( boost : : python : : init < int > ( ) ) . def ( boost : : python : : init < int , Identity * > ( ) ) . def ( boost : : python : : init < string > ( ) ) " mime_text text in Multipurpose Internet Mail Extensions format \n "
. def ( " __str__ " , & Message : : _str , " the string representation of a Message is it's MIME text " ) . def ( " __repr__ " , & Message : : _repr ) )
. add_property ( " dir " , ( int ( Message : : * ) ( ) ) ( PEP_msg_direction ( Message : : * ) ( ) ) & Message : : dir , ( void ( Message : : * ) ( int ) ) ( void ( Message : : * ) ( PEP_msg_direction ) ) & Message : : dir , " 0: incoming, 1: outgoing message " ) . def ( bp : : init < int > ( ) )
. add_property ( " id " , ( string ( Message : : * ) ( ) ) & Message : : id , ( void ( Message : : * ) ( string ) ) & Message : : id , " message ID " ) . add_property ( " shortmsg " , ( string ( Message : : * ) ( ) ) & Message : : shortmsg , ( void ( Message : : * ) ( string ) ) & Message : : shortmsg , " subject or short message " ) . def ( bp : : init < int , Identity * > ( ) )
. add_property ( " longmsg " , ( string ( Message : : * ) ( ) ) & Message : : longmsg , ( void ( Message : : * ) ( string ) ) & Message : : longmsg , " body or long version of message " ) . def ( bp : : init < string > ( ) )
. add_property ( " longmsg_formatted " , ( string ( Message : : * ) ( ) ) & Message : : longmsg_formatted , ( void ( Message : : * ) ( string ) ) & Message : : longmsg_formatted , " HTML body or fromatted long version of message " ) . def ( " __str__ " , & Message : : _str ,
. add_property ( " attachments " , ( boost : : python : : tuple ( Message : : * ) ( ) ) & Message : : attachments , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : attachments , " tuple of Blobs with attachments; setting moves Blobs to attachment tuple " ) " the string representation of a Message is it's MIME text "
. add_property ( " sent " , ( time_t ( Message : : * ) ( ) ) & Message : : sent , ( void ( Message : : * ) ( time_t ) ) & Message : : sent , " time when message was sent in UTC seconds since epoch " ) )
. add_property ( " recv " , ( time_t ( Message : : * ) ( ) ) & Message : : recv , ( void ( Message : : * ) ( time_t ) ) & Message : : recv , " time when message was received in UTC seconds since epoch " ) . def ( " __repr__ " , & Message : : _repr )
. add_property ( " from_ " , ( Identity ( Message : : * ) ( ) ) & Message : : from , ( void ( Message : : * ) ( object ) ) & Message : : from , " identity where message is from " ) . add_property ( " dir " , ( int ( Message : : * ) ( ) )
. add_property ( " to " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : to , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : to , " list of identities message is going to " ) ( PEP_msg_direction ( Message : : * ) ( ) ) & Message : : dir ,
. add_property ( " recv_by " , ( Identity ( Message : : * ) ( ) ) & Message : : recv_by , ( void ( Message : : * ) ( object ) ) & Message : : recv_by , " identity where message was received by " ) ( void ( Message : : * ) ( int ) )
. add_property ( " cc " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : cc , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : cc , " list of identities message is going cc " ) ( void ( Message : : * ) ( PEP_msg_direction ) ) & Message : : dir ,
. add_property ( " bcc " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : bcc , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : bcc , " list of identities message is going bcc " ) " 0: incoming, 1: outgoing message " )
. add_property ( " reply_to " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : reply_to , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : reply_to , " list of identities where message will be replied to " ) . add_property ( " id " , ( string ( Message : : * ) ( ) ) & Message : : id ,
. add_property ( " in_reply_to " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : in_reply_to , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : in_reply_to , " in_reply_to list " ) ( void ( Message : : * ) ( string ) ) & Message : : id ,
. add_property ( " references " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : references , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : references , " message IDs of messages this one is referring to " ) " message ID " )
. add_property ( " keywords " , ( boost : : python : : list ( Message : : * ) ( ) ) & Message : : keywords , ( void ( Message : : * ) ( boost : : python : : list ) ) & Message : : keywords , " keywords this message should be stored under " ) . add_property ( " shortmsg " , ( string ( Message : : * ) ( ) ) & Message : : shortmsg ,
. add_property ( " comments " , ( string ( Message : : * ) ( ) ) & Message : : comments , ( void ( Message : : * ) ( string ) ) & Message : : comments , " comments added to message " ) . add_property ( " opt_fields " , ( dict ( Message : : * ) ( ) ) & Message : : opt_fields , ( void ( Message : : * ) ( dict ) ) & Message : : opt_fields , " opt_fields of message " ) ( void ( Message : : * ) ( string ) ) & Message : : shortmsg ,
. add_property ( " enc_format " , ( int ( Message : : * ) ( ) ) ( PEP_enc_format ( Message : : * ) ( ) ) & Message : : enc_format , ( void ( Message : : * ) ( int ) ) ( void ( Message : : * ) ( : : PEP_enc_format ) ) & Message : : enc_format , " 0: unencrypted, 1: inline PGP, 2: S/MIME, 3: PGP/MIME, 4: p≡p format " ) " subject or short message " )
. def ( " encrypt " , ( Message ( Message : : * ) ( ) ) & Message : : encrypt ) . def ( " encrypt " , ( Message ( Message : : * ) ( boost : : python : : list ) ) & Message : : _encrypt ) . def ( " encrypt " , ( Message ( Message : : * ) ( boost : : python : : list , int ) ) & Message : : _encrypt ) . add_property ( " longmsg " , ( string ( Message : : * ) ( ) ) & Message : : longmsg ,
. def ( " encrypt " , ( Message ( Message : : * ) ( boost : : python : : list , int , int ) ) & Message : : _encrypt , " msg2 = msg1.encrypt(extra_keys=[], enc_format='pEp', flags=0) \n " ( void ( Message : : * ) ( string ) ) & Message : : longmsg ,
" body or long version of message " )
. add_property ( " longmsg_formatted " , ( string ( Message : : * ) ( ) ) & Message : : longmsg_formatted ,
( void ( Message : : * ) ( string ) ) & Message : : longmsg_formatted ,
" HTML body or fromatted long version of message " )
. add_property ( " attachments " , ( bp : : tuple ( Message : : * ) ( ) ) & Message : : attachments ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : attachments ,
" tuple of Blobs with attachments; setting moves Blobs to attachment tuple " )
. add_property ( " sent " , ( time_t ( Message : : * ) ( ) ) & Message : : sent ,
( void ( Message : : * ) ( time_t ) ) & Message : : sent ,
" time when message was sent in UTC seconds since epoch " )
. add_property ( " recv " , ( time_t ( Message : : * ) ( ) ) & Message : : recv ,
( void ( Message : : * ) ( time_t ) ) & Message : : recv ,
" time when message was received in UTC seconds since epoch " )
. add_property ( " from_ " , ( Identity ( Message : : * ) ( ) ) & Message : : from ,
( void ( Message : : * ) ( bp : : object ) ) & Message : : from ,
" identity where message is from " )
. add_property ( " to " , ( bp : : list ( Message : : * ) ( ) ) & Message : : to ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : to ,
" list of identities message is going to " )
. add_property ( " recv_by " , ( Identity ( Message : : * ) ( ) ) & Message : : recv_by ,
( void ( Message : : * ) ( bp : : object ) ) & Message : : recv_by ,
" identity where message was received by " )
. add_property ( " cc " , ( bp : : list ( Message : : * ) ( ) ) & Message : : cc ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : cc ,
" list of identities message is going cc " )
. add_property ( " bcc " , ( bp : : list ( Message : : * ) ( ) ) & Message : : bcc ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : bcc ,
" list of identities message is going bcc " )
. add_property ( " reply_to " , ( bp : : list ( Message : : * ) ( ) ) & Message : : reply_to ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : reply_to ,
" list of identities where message will be replied to " )
. add_property ( " in_reply_to " , ( bp : : list ( Message : : * ) ( ) ) & Message : : in_reply_to ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : in_reply_to ,
" in_reply_to list " )
. add_property ( " references " , ( bp : : list ( Message : : * ) ( ) ) & Message : : references ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : references ,
" message IDs of messages this one is referring to " )
. add_property ( " keywords " , ( bp : : list ( Message : : * ) ( ) ) & Message : : keywords ,
( void ( Message : : * ) ( bp : : list ) ) & Message : : keywords ,
" keywords this message should be stored under " )
. add_property ( " comments " , ( string ( Message : : * ) ( ) ) & Message : : comments ,
( void ( Message : : * ) ( string ) ) & Message : : comments ,
" comments added to message " )
. add_property ( " opt_fields " , ( bp : : dict ( Message : : * ) ( ) ) & Message : : opt_fields ,
( void ( Message : : * ) ( bp : : dict ) ) & Message : : opt_fields ,
" opt_fields of message " )
. add_property ( " enc_format " , ( int ( Message : : * ) ( ) )
( PEP_enc_format ( Message : : * ) ( ) ) & Message : : enc_format ,
( void ( Message : : * ) ( int ) )
( void ( Message : : * ) ( : : PEP_enc_format ) ) & Message : : enc_format ,
" 0: unencrypted, 1: inline PGP, 2: S/MIME, 3: PGP/MIME, 4: p≡p format " )
. def ( " encrypt " , ( Message ( Message : : * ) ( ) ) & Message : : encrypt )
. def ( " encrypt " , ( Message ( Message : : * ) ( bp : : list ) ) & Message : : _encrypt )
. def ( " encrypt " , ( Message ( Message : : * ) ( bp : : list , int ) ) & Message : : _encrypt )
. def ( " encrypt " , ( Message ( Message : : * ) ( bp : : list , int , int ) ) & Message : : _encrypt ,
" msg2 = msg1.encrypt(extra_keys=[], enc_format='pEp', flags=0) \n "
" \n " " \n "
" encrypts a p≡p message and returns the encrypted message \n " " encrypts a p≡p message and returns the encrypted message \n "
" \n " " \n "
@ -321,58 +440,87 @@ BOOST_PYTHON_MODULE (_pEp) {
" for encryption \n " " for encryption \n "
" enc_format 0 for none, 1 for partitioned, 2 for S/MIME, \n " " enc_format 0 for none, 1 for partitioned, 2 for S/MIME, \n "
" 3 for PGP/MIME, 4 for pEp \n " " 3 for PGP/MIME, 4 for pEp \n "
" flags 1 is force encryption \n " ) . def ( " decrypt " , & Message : : decrypt , boost : : python : : arg ( " flags " ) = 0 , " msg2, keys, rating, flags = msg1.decrypt() \n " " flags 1 is force encryption \n "
)
. def ( " decrypt " , & Message : : decrypt , bp : : arg ( " flags " ) = 0 ,
" msg2, keys, rating, flags = msg1.decrypt() \n "
" \n " " \n "
" decrypts a p≡p message and returns a tuple with data \n " " decrypts a p≡p message and returns a tuple with data \n "
" \n " " \n "
" msg the decrypted p≡p message \n " " msg the decrypted p≡p message \n "
" keys a list of keys being used \n " " keys a list of keys being used \n "
" rating the rating of the message as integer \n " " rating the rating of the message as integer \n "
" flags flags set while decryption \n " ) " flags flags set while decryption \n "
. add_property ( " outgoing_rating " , & Message : : outgoing_rating , " rating outgoing message will have " ) . add_property ( " outgoing_color " , & Message : : outgoing_color , " color outgoing message will have as PEP_color " ) . def ( " __deepcopy__ " , & Message : : deepcopy ) . def ( " __copy__ " , & Message : : copy ) ; )
. add_property ( " outgoing_rating " , & Message : : outgoing_rating , " rating outgoing message will have " )
. add_property ( " outgoing_color " , & Message : : outgoing_color , " color outgoing message will have as PEP_color " )
. def ( " __deepcopy__ " , & Message : : deepcopy )
. def ( " __copy__ " , & Message : : copy ) ;
// basic API and key management API
// basic API and key management API
def ( " update_identity " , & update_identity , " update_identity(ident) \n " def ( " update_identity " , & update_identity ,
" update_identity(ident) \n "
" \n " " \n "
" update identity information \n " " update identity information \n "
" call this to complete identity information when you at least have an address \n " ) ; " call this to complete identity information when you at least have an address \n "
def ( " myself " , & myself , " myself(ident) \n " ) ;
def ( " myself " , & myself ,
" myself(ident) \n "
" \n " " \n "
" ensures that the own identity is being complete \n " " ensures that the own identity is being complete \n "
" supply ident.address and ident.username \n " ) ; " supply ident.address and ident.username \n "
def ( " trust_personal_key " , & trust_personal_key , " trust_personal_key(ident) \n " ) ;
def ( " trust_personal_key " , & trust_personal_key ,
" trust_personal_key(ident) \n "
" \n " " \n "
" mark a key as trusted with a person \n " ) ; " mark a key as trusted with a person \n "
) ;
enum_ < : : identity_flags > ( " identity_flags " ) . value ( " PEP_idf_not_for_sync " , : : PEP_idf_not_for_sync ) . value ( " PEP_idf_list " , : : PEP_idf_list ) . value ( " PEP_idf_devicegroup " , : : PEP_idf_devicegroup ) ; enum_ < : : identity_flags > ( " identity_flags " )
. value ( " PEP_idf_not_for_sync " , : : PEP_idf_not_for_sync )
. value ( " PEP_idf_list " , : : PEP_idf_list )
. value ( " PEP_idf_devicegroup " , : : PEP_idf_devicegroup ) ;
def ( " set_identity_flags " , & set_identity_flags , " set_identity_flags(ident, flags) \n " def ( " set_identity_flags " , & set_identity_flags ,
" set_identity_flags(ident, flags) \n "
" \n " " \n "
" set identity flags \n " ) ; " set identity flags \n "
) ;
def ( " unset_identity_flags " , & unset_identity_flags , " unset_identity_flags(ident, flags) \n " def ( " unset_identity_flags " , & unset_identity_flags ,
" unset_identity_flags(ident, flags) \n "
" \n " " \n "
" unset identity flags \n " ) ; " unset identity flags \n "
) ;
def ( " key_reset_trust " , & key_reset_trust , " key_reset_trust(ident) \n " def ( " key_reset_trust " , & key_reset_trust ,
" key_reset_trust(ident) \n "
" \n " " \n "
" reset trust bit or explicitly mistrusted status for an identity and " " reset trust bit or explicitly mistrusted status for an identity and "
" its accompanying key/user_id pair \n " ) ; " its accompanying key/user_id pair \n "
) ;
def ( " import_key " , & import_key , " private_key_list = import_key(key_data) \n " def ( " import_key " , & import_key ,
" private_key_list = import_key(key_data) \n "
" \n " " \n "
" import key(s) from key_data \n " ) ; " import key(s) from key_data \n "
) ;
def ( " export_key " , & export_key , " key_data = export_key(identity) \n " def ( " export_key " , & export_key ,
" key_data = export_key(identity) \n "
" \n " " \n "
" export key(s) of identity \n " ) ; " export key(s) of identity \n "
) ;
def ( " export_secret_key " , & export_secret_key , " key_data = export_seret_key(identity) \n " def ( " export_secret_key " , & export_secret_key ,
" key_data = export_seret_key(identity) \n "
" \n " " \n "
" export secret key(s) of identity \n " ) ; " export secret key(s) of identity \n "
) ;
def ( " set_own_key " , & set_own_key , " set_own_key(me, fpr) \n " def ( " set_own_key " , & set_own_key ,
" set_own_key(me, fpr) \n "
" \n " " \n "
" mark a key as an own key, and make it the default key \n " " mark a key as an own key, and make it the default key \n "
" \n " " \n "
@ -383,90 +531,132 @@ BOOST_PYTHON_MODULE (_pEp) {
" myself() is called by set_own_key() without key generation \n " " myself() is called by set_own_key() without key generation \n "
" me->flags are ignored \n " " me->flags are ignored \n "
" me->address must not be an alias \n " " me->address must not be an alias \n "
" me->fpr will be ignored and replaced by fpr \n " ) ; " me->fpr will be ignored and replaced by fpr \n "
) ;
// message API
// message API
enum_ < : : PEP_rating > ( " rating " ) . value ( " _undefined " , : : PEP_rating_undefined ) . value ( " cannot_decrypt " , : : PEP_rating_cannot_decrypt ) . value ( " have_no_key " , : : PEP_rating_have_no_key ) . value ( " unencrypted " , : : PEP_rating_unencrypted ) . value ( " unreliable " , : : PEP_rating_unreliable ) enum_ < : : PEP_rating > ( " rating " )
. value ( " reliable " , : : PEP_rating_reliable ) . value ( " trusted " , : : PEP_rating_trusted ) . value ( " trusted_and_anonymized " , : : PEP_rating_trusted_and_anonymized ) . value ( " fully_anonymous " , : : PEP_rating_fully_anonymous ) . value ( " mistrust " , : : PEP_rating_mistrust ) . value ( " b0rken " , : : PEP_rating_b0rken ) . value ( " _undefined " , : : PEP_rating_undefined )
. value ( " cannot_decrypt " , : : PEP_rating_cannot_decrypt )
. value ( " have_no_key " , : : PEP_rating_have_no_key )
. value ( " unencrypted " , : : PEP_rating_unencrypted )
. value ( " unreliable " , : : PEP_rating_unreliable )
. value ( " reliable " , : : PEP_rating_reliable )
. value ( " trusted " , : : PEP_rating_trusted )
. value ( " trusted_and_anonymized " , : : PEP_rating_trusted_and_anonymized )
. value ( " fully_anonymous " , : : PEP_rating_fully_anonymous )
. value ( " mistrust " , : : PEP_rating_mistrust )
. value ( " b0rken " , : : PEP_rating_b0rken )
. value ( " under_attack " , : : PEP_rating_under_attack ) ; . value ( " under_attack " , : : PEP_rating_under_attack ) ;
enum_ < : : PEP_color > ( " colorvalue " ) . value ( " no_color " , : : PEP_color_no_color ) . value ( " yellow " , : : PEP_color_yellow ) . value ( " green " , : : PEP_color_green ) . value ( " red " , : : PEP_color_red ) ; enum_ < : : PEP_color > ( " colorvalue " )
. value ( " no_color " , : : PEP_color_no_color )
. value ( " yellow " , : : PEP_color_yellow )
. value ( " green " , : : PEP_color_green )
. value ( " red " , : : PEP_color_red ) ;
def ( " incoming_message " , & incoming_message , " msg = incoming_message(mime_text) \n " def ( " incoming_message " , & incoming_message ,
" msg = incoming_message(mime_text) \n "
" \n " " \n "
" create an incoming message from a MIME text " ) ; " create an incoming message from a MIME text "
def ( " outgoing_message " , & outgoing_message , " msg = outgoing_message(ident) \n " ) ;
def ( " outgoing_message " , & outgoing_message ,
" msg = outgoing_message(ident) \n "
" \n " " \n "
" create an outgoing message using an own identity " ) ; " create an outgoing message using an own identity "
def ( " color " , & _color , " c = color(rating) \n " ) ;
def ( " color " , & _color ,
" c = color(rating) \n "
" \n " " \n "
" calculate color value out of rating. Returns PEP_color " ) ; " calculate color value out of rating. Returns PEP_color "
def ( " trustwords " , & _trustwords , " text = trustwords(ident_own, ident_partner) \n " ) ;
def ( " trustwords " , & _trustwords ,
" text = trustwords(ident_own, ident_partner) \n "
" \n " " \n "
" calculate trustwords for two Identities " ) ; " calculate trustwords for two Identities " ) ;
// Sync API
// Sync API
enum_ < : : sync_handshake_signal > ( " sync_handshake_signal " ) . value ( " SYNC_NOTIFY_UNDEFINED " , : : SYNC_NOTIFY_UNDEFINED ) . value ( " SYNC_NOTIFY_INIT_ADD_OUR_DEVICE " , : : SYNC_NOTIFY_INIT_ADD_OUR_DEVICE ) . value ( " SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE " , : : SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE ) enum_ < : : sync_handshake_signal > ( " sync_handshake_signal " )
. value ( " SYNC_NOTIFY_INIT_FORM_GROUP " , : : SYNC_NOTIFY_INIT_FORM_GROUP ) . value ( " SYNC_NOTIFY_TIMEOUT " , : : SYNC_NOTIFY_TIMEOUT ) . value ( " SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED " , : : SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED ) . value ( " SYNC_NOTIFY_ACCEPTED_GROUP_CREATED " , : : SYNC_NOTIFY_ACCEPTED_GROUP_CREATED ) . value ( " SYNC_NOTIFY_UNDEFINED " , : : SYNC_NOTIFY_UNDEFINED )
. value ( " SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED " , : : SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED ) . value ( " SYNC_NOTIFY_SOLE " , : : SYNC_NOTIFY_SOLE ) . value ( " SYNC_NOTIFY_IN_GROUP " , : : SYNC_NOTIFY_IN_GROUP ) ; . value ( " SYNC_NOTIFY_INIT_ADD_OUR_DEVICE " , : : SYNC_NOTIFY_INIT_ADD_OUR_DEVICE )
. value ( " SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE " , : : SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE )
// auto user_interface_class = class_<UserInterface, UserInterface_callback, boost::noncopyable>(
. value ( " SYNC_NOTIFY_INIT_FORM_GROUP " , : : SYNC_NOTIFY_INIT_FORM_GROUP )
// "UserInterface",
. value ( " SYNC_NOTIFY_TIMEOUT " , : : SYNC_NOTIFY_TIMEOUT )
// "class MyUserInterface(UserInterface):\n"
. value ( " SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED " , : : SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED )
// " def notifyHandshake(self, me, partner):\n"
. value ( " SYNC_NOTIFY_ACCEPTED_GROUP_CREATED " , : : SYNC_NOTIFY_ACCEPTED_GROUP_CREATED )
// " ...\n"
. value ( " SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED " , : : SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED )
// "\n"
. value ( " SYNC_NOTIFY_SOLE " , : : SYNC_NOTIFY_SOLE )
// "p≡p User Interface class\n"
. value ( " SYNC_NOTIFY_IN_GROUP " , : : SYNC_NOTIFY_IN_GROUP ) ;
// "To be used as a mixin\n"
// )
// auto user_interface_class = class_<UserInterface, UserInterface_callback, boost::noncopyable>(
// .def("notifyHandshake", &UserInterface::notifyHandshake,
// "UserInterface",
// "notifyHandshake(self, me, partner)\n"
// "class MyUserInterface(UserInterface):\n"
// "\n"
// " def notifyHandshake(self, me, partner):\n"
// " me own identity\n"
// " ...\n"
// " partner identity of communication partner\n"
// "\n"
// "\n"
// "p≡p User Interface class\n"
// "overwrite this method with an implementation of a handshake dialog")
// "To be used as a mixin\n"
// .def("deliverHandshakeResult", &UserInterface::deliverHandshakeResult,
// )
// boost::python::arg("identities")=object(),
// .def("notifyHandshake", &UserInterface::notifyHandshake,
// "deliverHandshakeResult(self, result, identities=None)\n"
// "notifyHandshake(self, me, partner)\n"
// "\n"
// "\n"
// " result -1: cancel, 0: accepted, 1: rejected\n"
// " me own identity\n"
// " identities list of identities to share or None for all\n"
// " partner identity of communication partner\n"
// "\n"
// "\n"
// "call to deliver the handshake result of the handshake dialog"
// "overwrite this method with an implementation of a handshake dialog")
// );
// .def("deliverHandshakeResult", &UserInterface::deliverHandshakeResult,
// bp::arg("identities")=object(),
def ( " deliver_handshake_result " , & deliverHandshakeResult , boost : : python : : arg ( " identities " ) = object ( ) , " deliverHandshakeResult(self, result, identities=None) \n " // "deliverHandshakeResult(self, result, identities=None)\n"
// "\n"
// " result -1: cancel, 0: accepted, 1: rejected\n"
// " identities list of identities to share or None for all\n"
// "\n"
// "call to deliver the handshake result of the handshake dialog"
// );
def ( " deliver_handshake_result " , & deliverHandshakeResult , bp : : arg ( " identities " ) = bp : : object ( ) ,
" deliverHandshakeResult(self, result, identities=None) \n "
" \n " " \n "
" result -1: cancel, 0: accepted, 1: rejected \n " " result -1: cancel, 0: accepted, 1: rejected \n "
" identities list of identities to share or None for all \n " " identities list of identities to share or None for all \n "
" \n " " \n "
" call to deliver the handshake result of the handshake dialog " ) ; " call to deliver the handshake result of the handshake dialog "
) ;
def ( " start_sync " , & start_sync , " start_sync() \n " def ( " start_sync " , & start_sync ,
" start_sync() \n "
" \n " " \n "
" starts the sync thread " ) ; " starts the sync thread "
) ;
def ( " shutdown_sync " , & shutdown_sync , " shutdown_sync() \n " def ( " shutdown_sync " , & shutdown_sync ,
" shutdown_sync() \n "
" \n " " \n "
" call this from another thread to shut down the sync thread \n " ) ; " call this from another thread to shut down the sync thread \n "
) ;
def ( " debug_color " , & debug_color , " for debug builds set ANSI color value " ) ; def ( " debug_color " , & debug_color ,
" for debug builds set ANSI color value " ) ;
def ( " leave_device_group " , & leave_device_group , " leave_device_group() \n " def ( " leave_device_group " , & leave_device_group ,
" leave_device_group() \n "
" \n " " \n "
" call this for a grouped device, which should leave \n " ) ; " call this for a grouped device, which should leave \n "
) ;
def ( " is_sync_active " , & is_sync_active , " is_sync_active() \n " def ( " is_sync_active " , & is_sync_active ,
" is_sync_active() \n "
" \n " " \n "
" True if sync is active, False otherwise \n " ) ; " True if sync is active, False otherwise \n "
) ;
// codecs
// codecs
call < object > ( ( ( object ) ( import ( " codecs " ) . attr ( " register " ) ) ) . ptr ( ) , make_function ( sync_search ) ) ; bp : : call < bp : : object > ( ( ( bp : : object ) ( bp : : import ( " codecs " ) . attr ( " register " ) ) ) . ptr ( ) , make_function ( sync_search ) ) ;
call < object > ( ( ( object ) ( import ( " codecs " ) . attr ( " register " ) ) ) . ptr ( ) , make_function ( distribution_search ) ) ; bp : : call < bp : : object > ( ( ( bp : : object ) ( bp : : import ( " codecs " ) . attr ( " register " ) ) ) . ptr ( ) , make_function ( distribution_search ) ) ;
} }
} // namespace PythonAdapter
} // namespace PythonAdapter
} // namespace pEp
} // namespace pEp
heck
5 years ago