(defvar riece-epg-passphrase-alist nil)
-(defun riece-epg-passphrase-callback-function (key-id identity)
+(defun riece-epg-passphrase-callback-function (context key-id identity)
(if (eq key-id 'SYM)
(let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
passphrase)
(setq entry (list identity)
riece-epg-passphrase-alist (cons entry
riece-epg-passphrase-alist)))
- (setq passphrase (epg-passphrase-callback-function key-id nil))
+ (setq passphrase (epg-passphrase-callback-function context
+ key-id nil))
(setcdr entry (copy-sequence passphrase))
passphrase)))
- (epg-passphrase-callback-function key-id nil)))
+ (epg-passphrase-callback-function context key-id nil)))
+
+(defun riece-epg-passphrase-callback-function-for-decrypt (context key-id
+ identity)
+ (if (eq key-id 'SYM)
+ (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
+ passphrase)
+ (if (cdr entry)
+ (copy-sequence (cdr entry))
+ (epg-cancel context)))
+ (epg-passphrase-callback-function context key-id nil)))
(defun riece-epg-funcall-clear-passphrase (identity function &rest args)
(condition-case error
(signal (car error) (cdr error)))))
(defun riece-command-enter-encrypted-message ()
- "Encrypt the current line send send it to the current channel."
+ "Encrypt the current line and send it to the current channel."
(interactive)
(let ((context (epg-make-context))
- (string (buffer-substring
- (riece-line-beginning-position)
- (riece-line-end-position)))
+ (string (buffer-substring (riece-line-beginning-position)
+ (riece-line-end-position)))
entry)
- (riece-with-server-buffer (riece-identity-server riece-current-channel)
- (setq string (riece-encode-coding-string-for-identity
- string
- riece-current-channel)))
(epg-context-set-passphrase-callback
context
(cons #'riece-epg-passphrase-callback-function
riece-current-channel))
- (setq string (riece-epg-funcall-clear-passphrase riece-current-channel
- #'epg-encrypt-string
- context string nil))
- (riece-command-send-message
- (concat "[encrypted:" (base64-encode-string string t) "]")
- nil)
+ (riece-send-string
+ (format "PRIVMSG %s :[encrypted:%s]\r\n"
+ (riece-identity-prefix riece-current-channel)
+ (base64-encode-string
+ (riece-epg-funcall-clear-passphrase
+ riece-current-channel
+ #'epg-encrypt-string
+ context
+ (riece-with-server-buffer
+ (riece-identity-server riece-current-channel)
+ (riece-encode-coding-string-for-identity
+ string
+ riece-current-channel))
+ nil)
+ t)))
+ (riece-display-message
+ (riece-make-message (riece-current-nickname) riece-current-channel
+ (concat "[decrypted:" string "]") nil t))
(let ((next-line-add-newlines t))
(next-line 1))))
-(defun riece-command-change-passphrase (identity passphrase)
- "Change PASSPHRASE associated with IDENTITY."
+(defun riece-command-set-passphrase (identity passphrase)
+ "Set PASSPHRASE associated with IDENTITY."
(interactive
(let ((identity
(riece-completing-read-identity
(cons (cons identity passphrase)
riece-epg-passphrase-alist))))))
+(defun riece-epg-decrypt-string-for-identity (context cipher target)
+ (let ((coding-system
+ (or (riece-coding-system-for-identity target)
+ riece-default-coding-system)))
+ (riece-with-server-buffer (riece-identity-server target)
+ (decode-coding-string
+ (riece-epg-funcall-clear-passphrase
+ target
+ #'epg-decrypt-string
+ context
+ (base64-decode-string cipher))
+ (if (consp coding-system)
+ (car coding-system)
+ coding-system)))))
+
(defun riece-epg-message-filter (message)
(if (get 'riece-epg 'riece-addon-enabled)
(when (string-match "\\`\\[encrypted:\\(.*\\)]"
(riece-message-text message))
(let ((context (epg-make-context))
(string (match-string 1 (riece-message-text message)))
- (coding-system (or (riece-coding-system-for-identity
- (riece-message-target message))
- riece-default-coding-system))
entry)
(epg-context-set-passphrase-callback
context
- (cons #'riece-epg-passphrase-callback-function
- (riece-message-target message)))
+ (cons #'riece-epg-passphrase-callback-function-for-decrypt
+ riece-current-channel))
(condition-case error
(progn
- (setq string (base64-decode-string string))
(riece-message-set-text
message
- (concat
- "[decrypted:"
- (riece-with-server-buffer
- (riece-identity-server (riece-message-target message))
- (decode-coding-string
- (riece-epg-funcall-clear-passphrase
- (riece-message-target message)
- #'epg-decrypt-string context string)
- (if (consp coding-system)
- (car coding-system)
- coding-system)))
- "]")))
- (error (message "%s" (cdr error)))))))
+ (format "[decrypted:%s]"
+ (riece-epg-decrypt-string-for-identity
+ context string (riece-message-target message)))))
+ (error
+ (riece-put-text-property-nonsticky
+ 0 (length (riece-message-text message))
+ 'riece-epg-encryption-target (riece-message-target message)
+ (riece-message-text message))
+ (if riece-debug
+ (message "Couldn't decrypt: %s" (cdr error))
+ (message "Couldn't decrypt")))))))
message)
+(defun riece-epg-add-encrypted-button (start end)
+ (if (and (get 'riece-button 'riece-addon-enabled)
+ (get 'riece-epg 'riece-addon-enabled))
+ (riece-scan-property-region
+ 'riece-epg-encryption-target
+ start end
+ (lambda (start end)
+ (let ((inhibit-read-only t)
+ buffer-read-only)
+ (widget-convert-button
+ 'link start end
+ :help-echo "Click to decrypt"
+ :notify #'riece-epg-encrypted-button-notify
+ (get-text-property start 'riece-epg-encryption-target)))))))
+
+(defun riece-epg-encrypted-button-notify (widget &rest ignore)
+ (let* ((from (marker-position (widget-get widget :from)))
+ (to (marker-position (widget-get widget :to)))
+ (target (widget-get widget :value))
+ (cipher (buffer-substring from to))
+ (inhibit-read-only t)
+ buffer-read-only
+ plain)
+ (when (string-match "\\`\\[encrypted:\\(.*\\)]" cipher)
+ (setq plain (riece-epg-decrypt-string-for-identity
+ (epg-make-context) (match-string 1 cipher) target))
+ (widget-delete widget)
+ (delete-region from to)
+ (save-excursion
+ (goto-char from)
+ (insert "[decrypted:" plain "]")))))
+
+(defun riece-epg-requires ()
+ (if (memq 'riece-button riece-addons)
+ '(riece-button)))
+
(defun riece-epg-insinuate ()
- (add-hook 'riece-message-filter-functions 'riece-epg-message-filter))
+ (add-hook 'riece-message-filter-functions 'riece-epg-message-filter)
+ (add-hook 'riece-after-insert-functions 'riece-epg-add-encrypted-button))
(defun riece-epg-uninstall ()
- (remove-hook 'riece-message-filter-functions 'riece-epg-message-filter))
+ (remove-hook 'riece-message-filter-functions 'riece-epg-message-filter)
+ (remove-hook 'riece-after-insert-functions 'riece-epg-add-encrypted-button))
(defvar riece-command-mode-map)
(defun riece-epg-enable ()
(define-key riece-command-mode-map
"\C-ce" 'riece-command-enter-encrypted-message)
(define-key riece-command-mode-map
- "\C-c\C-ec" 'riece-command-change-passphrase))
+ "\C-c\C-ec" 'riece-command-set-passphrase))
(defun riece-epg-disable ()
(define-key riece-command-mode-map