Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vmj-qt
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
vmj-qt
Commits
3c0d9d7b
Commit
3c0d9d7b
authored
Aug 12, 2022
by
Tijmen de Mes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Save received public keys
parent
ee7708fc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
2 deletions
+24
-2
messages.py
blink/messages.py
+24
-2
No files found.
blink/messages.py
View file @
3c0d9d7b
import
os
import
uuid
import
uuid
from
collections
import
deque
from
collections
import
deque
from
application
import
log
from
application
import
log
from
application.notification
import
IObserver
,
NotificationCenter
,
NotificationData
from
application.notification
import
IObserver
,
NotificationCenter
,
NotificationData
from
application.python
import
Null
from
application.python
import
Null
from
application.system
import
makedirs
from
application.python.types
import
Singleton
from
application.python.types
import
Singleton
from
zope.interface
import
implementer
from
zope.interface
import
implementer
...
@@ -16,6 +18,7 @@ from sipsimple.lookup import DNSLookup
...
@@ -16,6 +18,7 @@ from sipsimple.lookup import DNSLookup
from
sipsimple.payloads.iscomposing
import
IsComposingDocument
,
IsComposingMessage
,
State
,
LastActive
,
Refresh
,
ContentType
from
sipsimple.payloads.iscomposing
import
IsComposingDocument
,
IsComposingMessage
,
State
,
LastActive
,
Refresh
,
ContentType
from
sipsimple.payloads.imdn
import
IMDNDocument
,
DeliveryNotification
,
DisplayNotification
from
sipsimple.payloads.imdn
import
IMDNDocument
,
DeliveryNotification
,
DisplayNotification
from
sipsimple.streams.msrp.chat
import
CPIMPayload
,
CPIMParserError
,
CPIMNamespace
,
CPIMHeader
,
ChatIdentity
,
Message
as
MSRPChatMessage
,
SimplePayload
from
sipsimple.streams.msrp.chat
import
CPIMPayload
,
CPIMParserError
,
CPIMNamespace
,
CPIMHeader
,
ChatIdentity
,
Message
as
MSRPChatMessage
,
SimplePayload
from
sipsimple.threading
import
run_in_thread
from
sipsimple.util
import
ISOTimestamp
from
sipsimple.util
import
ISOTimestamp
from
blink.sessions
import
SessionManager
,
StreamDescription
from
blink.sessions
import
SessionManager
,
StreamDescription
...
@@ -203,6 +206,20 @@ class MessageManager(object, metaclass=Singleton):
...
@@ -203,6 +206,20 @@ class MessageManager(object, metaclass=Singleton):
group
.
contacts
.
add
(
contact
)
group
.
contacts
.
add
(
contact
)
group
.
save
()
group
.
save
()
@
run_in_thread
(
'file-io'
)
def
_save_pgp_key
(
self
,
data
,
uri
):
print
(
f
'-- Saving public key for {uri}'
)
settings
=
SIPSimpleSettings
()
id
=
str
(
uri
)
.
replace
(
'/'
,
'_'
)
directory
=
settings
.
chat
.
keys_directory
.
normalized
filename
=
os
.
path
.
join
(
directory
,
id
+
'.pubkey'
)
makedirs
(
directory
)
with
open
(
filename
,
'wb'
)
as
f
:
data
=
data
if
isinstance
(
data
,
bytes
)
else
data
.
encode
()
f
.
write
(
data
)
def
_send_message
(
self
,
outgoing_message
):
def
_send_message
(
self
,
outgoing_message
):
self
.
_outgoing_message_queue
.
append
(
outgoing_message
)
self
.
_outgoing_message_queue
.
append
(
outgoing_message
)
self
.
_send_outgoing_messages
()
self
.
_send_outgoing_messages
()
...
@@ -258,7 +275,8 @@ class MessageManager(object, metaclass=Singleton):
...
@@ -258,7 +275,8 @@ class MessageManager(object, metaclass=Singleton):
return
return
if
content_type
.
lower
()
==
'text/pgp-public-key'
:
if
content_type
.
lower
()
==
'text/pgp-public-key'
:
return
# print('-- Received public key')
self
.
save_key
(
body
,
sender
.
uri
)
from
blink.contacts
import
URIUtils
from
blink.contacts
import
URIUtils
contact
,
contact_uri
=
URIUtils
.
find_contact
(
sender
.
uri
)
contact
,
contact_uri
=
URIUtils
.
find_contact
(
sender
.
uri
)
...
@@ -268,11 +286,15 @@ class MessageManager(object, metaclass=Singleton):
...
@@ -268,11 +286,15 @@ class MessageManager(object, metaclass=Singleton):
try
:
try
:
blink_session
=
next
(
session
for
session
in
self
.
sessions
if
session
.
contact
.
settings
is
contact
.
settings
)
blink_session
=
next
(
session
for
session
in
self
.
sessions
if
session
.
contact
.
settings
is
contact
.
settings
)
except
StopIteration
:
except
StopIteration
:
if
content_type
.
lower
()
in
[
IsComposingDocument
.
content_type
,
IMDNDocument
.
content_type
]
:
if
content_type
.
lower
()
in
self
.
__ignored_content_types__
:
return
return
else
:
else
:
blink_session
=
session_manager
.
create_session
(
contact
,
contact_uri
,
[
StreamDescription
(
'messages'
)],
account
=
account
,
connect
=
False
)
blink_session
=
session_manager
.
create_session
(
contact
,
contact_uri
,
[
StreamDescription
(
'messages'
)],
account
=
account
,
connect
=
False
)
if
content_type
.
lower
()
in
[
'text/pgp-public-key'
,
'text/pgp-private-key'
]:
notification_center
.
post_notification
(
'PGPKeysShouldReload'
,
sender
=
blink_session
)
return
if
content_type
.
lower
()
==
IsComposingDocument
.
content_type
:
if
content_type
.
lower
()
==
IsComposingDocument
.
content_type
:
try
:
try
:
document
=
IsComposingMessage
.
parse
(
body
)
document
=
IsComposingMessage
.
parse
(
body
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment