[Rt-commit] r7589 - in rt/branches/3.7-EXPERIMENTAL-TUNIS: .
docs/design_docs etc html/Elements html/SelfService
html/Ticket html/Ticket/Elements lib/RT lib/RT/Action
lib/RT/Crypt lib/RT/Interface lib/RT/Interface/Email/Auth
lib/RT/Interface/Web lib/t/data/crypt-gnupg
clkao at bestpractical.com
clkao at bestpractical.com
Fri Apr 20 13:49:14 EDT 2007
Author: clkao
Date: Fri Apr 20 13:49:12 2007
New Revision: 7589
Added:
rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/gnupg_details_on_output_formats
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowGnuPGStatus
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/UpdateCc
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/GnuPGNG.pm
Modified:
rt/branches/3.7-EXPERIMENTAL-TUNIS/ (props changed)
rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/rql_parser_machine.graphviz
rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_Config.pm.in
rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_SiteConfig.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/initialdata
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectOwner
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectStatus
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowUser
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/NoAuth/js/util.js
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Create.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/PreviewScrips
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowMessageStanza
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransaction
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransactionAttachments
rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Action/SendEmail.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Attachment_Overlay.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/MailFrom.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web/Request.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Record.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Template_Overlay.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Ticket_Overlay.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Transaction_Overlay.pm
rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/t/data/crypt-gnupg/random_seed
Log:
Merge down to tunis.
Added: rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/gnupg_details_on_output_formats
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/gnupg_details_on_output_formats Fri Apr 20 13:49:12 2007
@@ -0,0 +1,1253 @@
+
+*NOTE* This file is a copy of doc/DETAILS file that comes
+with gnupg-1.9.94 distribution.
+
+Format of colon listings
+========================
+First an example:
+
+$ gpg --fixed-list-mode --with-colons --list-keys \
+ --with-fingerprint --with-fingerprint wk at gnupg.org
+
+pub:f:1024:17:6C7EE1B8621CC013:899817715:1055898235::m:::scESC:
+fpr:::::::::ECAF7590EB3443B5C7CF3ACB6C7EE1B8621CC013:
+uid:f::::::::Werner Koch <wk at g10code.com>:
+uid:f::::::::Werner Koch <wk at gnupg.org>:
+sub:f:1536:16:06AD222CADF6A6E1:919537416:1036177416:::::e:
+fpr:::::::::CF8BCC4B18DE08FCD8A1615906AD222CADF6A6E1:
+sub:r:1536:20:5CE086B5B5A18FF4:899817788:1025961788:::::esc:
+fpr:::::::::AB059359A3B81F410FCFF97F5CE086B5B5A18FF4:
+
+The double --with-fingerprint prints the fingerprint for the subkeys
+too, --fixed-list-mode is themodern listing way printing dates in
+seconds since Epoch and does not merge the first userID with the pub
+record.
+
+
+ 1. Field: Type of record
+ pub = public key
+ crt = X.509 certificate
+ crs = X.509 certificate and private key available
+ sub = subkey (secondary key)
+ sec = secret key
+ ssb = secret subkey (secondary key)
+ uid = user id (only field 10 is used).
+ uat = user attribute (same as user id except for field 10).
+ sig = signature
+ rev = revocation signature
+ fpr = fingerprint: (fingerprint is in field 10)
+ pkd = public key data (special field format, see below)
+ grp = reserved for gpgsm
+ rvk = revocation key
+ tru = trust database information
+ spk = signature subpacket
+
+ 2. Field: A letter describing the calculated trust. This is a single
+ letter, but be prepared that additional information may follow
+ in some future versions. (not used for secret keys)
+ o = Unknown (this key is new to the system)
+ i = The key is invalid (e.g. due to a missing self-signature)
+ d = The key has been disabled
+ (deprecated - use the 'D' in field 12 instead)
+ r = The key has been revoked
+ e = The key has expired
+ - = Unknown trust (i.e. no value assigned)
+ q = Undefined trust
+ '-' and 'q' may safely be treated as the same
+ value for most purposes
+ n = Don't trust this key at all
+ m = There is marginal trust in this key
+ f = The key is fully trusted
+ u = The key is ultimately trusted. This often means
+ that the secret key is available, but any key may
+ be marked as ultimately trusted.
+ 3. Field: length of key in bits.
+ 4. Field: Algorithm: 1 = RSA
+ 16 = Elgamal (encrypt only)
+ 17 = DSA (sometimes called DH, sign only)
+ 20 = Elgamal (sign and encrypt - don't use them!)
+ (for other id's see include/cipher.h)
+ 5. Field: KeyID
+ 6. Field: Creation Date (in UTC). For UID and UAT records, this is the
+ self-signature date. Note that the dae is usally printed
+ in seconds since epoch, however, we are migrating to an ISO
+ 8601 format (e.g. "19660205T091500"). This is currently
+ only relevant for X.509, A simple way to detect the format
+ is be scannning for the 'T'.
+ 7. Field: Key or user ID/user attribute expiration date or empty if none.
+ 8. Field: Used for serial number in crt records (used to be the Local-ID).
+ For UID and UAT records, this is a hash of the user ID contents
+ used to represent that exact user ID. For trust signatures,
+ this is the trust depth seperated by the trust value by a
+ space.
+ 9. Field: Ownertrust (primary public keys only)
+ This is a single letter, but be prepared that additional
+ information may follow in some future versions. For trust
+ signatures with a regular expression, this is the regular
+ expression value, quoted as in field 10.
+10. Field: User-ID. The value is quoted like a C string to avoid
+ control characters (the colon is quoted "\x3a").
+ This is not used with --fixed-list-mode in gpg.
+ A UAT record puts the attribute subpacket count here, a
+ space, and then the total attribute subpacket size.
+ In gpgsm the issuer name comes here
+ An FPR record stores the fingerprint here.
+ The fingerprint of an revocation key is stored here.
+11. Field: Signature class. This is a 2 digit hexnumber followed by
+ either the letter 'x' for an exportable signature or the
+ letter 'l' for a local-only signature.
+ The class byte of an revocation key is also given here,
+ 'x' and 'l' ist used the same way.
+12. Field: Key capabilities:
+ e = encrypt
+ s = sign
+ c = certify
+ a = authentication
+ A key may have any combination of them in any order. In
+ addition to these letters, the primary key has uppercase
+ versions of the letters to denote the _usable_
+ capabilities of the entire key, and a potential letter 'D'
+ to indicate a disabled key.
+13. Field: Used in FPR records for S/MIME keys to store the fingerprint of
+ the issuer certificate. This is useful to build the
+ certificate path based on certificates stored in the local
+ keyDB; it is only filled if the issue certificate is
+ available. The advantage of using this value is that it is
+ guaranteed to have been been build by the same lookup
+ algorithm as gpgsm uses.
+ For "uid" recods this lists the preferences n the sameway the
+ -edit menu does.
+ For "sig" records, this is the fingerprint of the key that
+ issued the signature. Note that this is only filled in if
+ the signature verified correctly. Note also that for
+ various technical reasons, this fingerprint is only
+ available if --no-sig-cache is used.
+
+14. Field Flag field used in the --edit menu output:
+
+15. Field Used in sec/sbb to print the serial number of a token
+ (internal protect mode 1002) or a '#' if that key is a
+ simple stub (internal protect mode 1001)
+
+All dates are displayed in the format yyyy-mm-dd unless you use the
+option --fixed-list-mode in which case they are displayed as seconds
+since Epoch. More fields may be added later, so parsers should be
+prepared for this. When parsing a number the parser should stop at the
+first non-number character so that additional information can later be
+added.
+
+If field 1 has the tag "pkd", a listing looks like this:
+pkd:0:1024:B665B1435F4C2 .... FF26ABB:
+ ! ! !-- the value
+ ! !------ for information number of bits in the value
+ !--------- index (eg. DSA goes from 0 to 3: p,q,g,y)
+
+
+The "tru" trust database records have the fields:
+
+ 2: Reason for staleness of trust. If this field is empty, then the
+ trustdb is not stale. This field may have multiple flags in it:
+
+ o: Trustdb is old
+ t: Trustdb was built with a different trust model than the one we
+ are using now.
+
+ 3: Trust model:
+ 0: Classic trust model, as used in PGP 2.x.
+ 1: PGP trust model, as used in PGP 6 and later. This is the same
+ as the classic trust model, except for the addition of trust
+ signatures.
+
+ GnuPG before version 1.4 used the classic trust model by default.
+ GnuPG 1.4 and later uses the PGP trust model by default.
+
+ 4: Date trustdb was created in seconds since 1/1/1970.
+ 5: Date trustdb will expire in seconds since 1/1/1970.
+
+The "spk" signature subpacket records have the fields:
+
+ 2: Subpacket number as per RFC-2440 and later.
+ 3: Flags in hex. Currently the only two bits assigned are 1, to
+ indicate that the subpacket came from the hashed part of the
+ signature, and 2, to indicate the subpacket was marked critical.
+ 4: Length of the subpacket. Note that this is the length of the
+ subpacket, and not the length of field 5 below. Due to the need
+ for %-encoding, the length of field 5 may be up to 3x this value.
+ 5: The subpacket data. Printable ASCII is shown as ASCII, but other
+ values are rendered as %XX where XX is the hex value for the byte.
+
+
+Format of the "--status-fd" output
+==================================
+Every line is prefixed with "[GNUPG:] ", followed by a keyword with
+the type of the status line and a some arguments depending on the
+type (maybe none); an application should always be prepared to see
+more arguments in future versions.
+
+
+ NEWSIG
+ May be issued right before a signature verification starts. This
+ is useful to define a context for parsing ERROR status
+ messages. No arguments are currently defined.
+
+ GOODSIG <long keyid> <username>
+ The signature with the keyid is good. For each signature only
+ one of the three codes GOODSIG, BADSIG or ERRSIG will be
+ emitted and they may be used as a marker for a new signature.
+ The username is the primary one encoded in UTF-8 and %XX
+ escaped.
+
+ EXPSIG <long keyid> <username>
+ The signature with the keyid is good, but the signature is
+ expired. The username is the primary one encoded in UTF-8 and
+ %XX escaped.
+
+ EXPKEYSIG <long keyid> <username>
+ The signature with the keyid is good, but the signature was
+ made by an expired key. The username is the primary one
+ encoded in UTF-8 and %XX escaped.
+
+ REVKEYSIG <long keyid> <username>
+ The signature with the keyid is good, but the signature was
+ made by a revoked key. The username is the primary one
+ encoded in UTF-8 and %XX escaped.
+
+ BADSIG <long keyid> <username>
+ The signature with the keyid has not been verified okay.
+ The username is the primary one encoded in UTF-8 and %XX
+ escaped.
+
+ ERRSIG <long keyid> <pubkey_algo> <hash_algo> \
+ <sig_class> <timestamp> <rc>
+ It was not possible to check the signature. This may be
+ caused by a missing public key or an unsupported algorithm.
+ A RC of 4 indicates unknown algorithm, a 9 indicates a missing
+ public key. The other fields give more information about
+ this signature. sig_class is a 2 byte hex-value.
+
+ Note, that TIMESTAMP may either be a number with seconds since
+ epoch or an ISO 8601 string which can be detected by the
+ presence of the letter 'T' inside.
+
+ VALIDSIG <fingerprint in hex> <sig_creation_date> <sig-timestamp>
+ <expire-timestamp> <sig-version> <reserved> <pubkey-algo>
+ <hash-algo> <sig-class> <primary-key-fpr>
+
+ The signature with the keyid is good. This is the same as
+ GOODSIG but has the fingerprint as the argument. Both status
+ lines are emitted for a good signature. All arguments here
+ are on one long line. sig-timestamp is the signature creation
+ time in seconds after the epoch. expire-timestamp is the
+ signature expiration time in seconds after the epoch (zero
+ means "does not expire"). sig-version, pubkey-algo, hash-algo,
+ and sig-class (a 2-byte hex value) are all straight from the
+ signature packet. PRIMARY-KEY-FPR is the fingerprint of the
+ primary key or identical to the first argument. This is
+ useful to get back to the primary key without running gpg
+ again for this purpose.
+
+ Note, that *-TIMESTAMP may either be a number with seconds
+ since epoch or an ISO 8601 string which can be detected by the
+ presence of the letter 'T' inside.
+
+ SIG_ID <radix64_string> <sig_creation_date> <sig-timestamp>
+ This is emitted only for signatures of class 0 or 1 which
+ have been verified okay. The string is a signature id
+ and may be used in applications to detect replay attacks
+ of signed messages. Note that only DLP algorithms give
+ unique ids - others may yield duplicated ones when they
+ have been created in the same second.
+
+ Note, that SIG-TIMESTAMP may either be a number with seconds
+ since epoch or an ISO 8601 string which can be detected by the
+ presence of the letter 'T' inside.
+
+
+ ENC_TO <long keyid> <keytype> <keylength>
+ The message is encrypted to this keyid.
+ keytype is the numerical value of the public key algorithm,
+ keylength is the length of the key or 0 if it is not known
+ (which is currently always the case).
+
+ NODATA <what>
+ No data has been found. Codes for what are:
+ 1 - No armored data.
+ 2 - Expected a packet but did not found one.
+ 3 - Invalid packet found, this may indicate a non OpenPGP
+ message.
+ 4 - signature expected but not found
+ You may see more than one of these status lines.
+
+ UNEXPECTED <what>
+ Unexpected data has been encountered
+ 0 - not further specified 1
+
+
+ TRUST_UNDEFINED <error token>
+ TRUST_NEVER <error token>
+ TRUST_MARGINAL
+ TRUST_FULLY
+ TRUST_ULTIMATE
+ For good signatures one of these status lines are emitted
+ to indicate how trustworthy the signature is. The error token
+ values are currently only emiited by gpgsm.
+
+ PKA_TRUST_GOOD <mailbox>
+ PKA_TRUST_BAD <mailbox>
+ Depending on the outcome of the PKA check one of the above
+ status codes is emitted in addition to a TRUST_* status.
+ Without PKA info available or
+
+ SIGEXPIRED
+ This is deprecated in favor of KEYEXPIRED.
+
+ KEYEXPIRED <expire-timestamp>
+ The key has expired. expire-timestamp is the expiration time
+ in seconds after the epoch.
+
+ Note, that TIMESTAMP may either be a number with seconds since
+ epoch or an ISO 8601 string which can be detected by the
+ presence of the letter 'T' inside.
+
+ KEYREVOKED
+ The used key has been revoked by its owner. No arguments yet.
+
+ BADARMOR
+ The ASCII armor is corrupted. No arguments yet.
+
+ RSA_OR_IDEA
+ The IDEA algorithms has been used in the data. A
+ program might want to fallback to another program to handle
+ the data if GnuPG failed. This status message used to be emitted
+ also for RSA but this has been dropped after the RSA patent expired.
+ However we can't change the name of the message.
+
+ SHM_INFO
+ SHM_GET
+ SHM_GET_BOOL
+ SHM_GET_HIDDEN
+
+ GET_BOOL
+ GET_LINE
+ GET_HIDDEN
+ GOT_IT
+
+ NEED_PASSPHRASE <long main keyid> <long keyid> <keytype> <keylength>
+ Issued whenever a passphrase is needed.
+ keytype is the numerical value of the public key algorithm
+ or 0 if this is not applicable, keylength is the length
+ of the key or 0 if it is not known (this is currently always the case).
+
+ NEED_PASSPHRASE_SYM <cipher_algo> <s2k_mode> <s2k_hash>
+ Issued whenever a passphrase for symmetric encryption is needed.
+
+ NEED_PASSPHRASE_PIN <card_type> <chvno> [<serialno>]
+ Issued whenever a PIN is requested to unlock a card.
+
+ MISSING_PASSPHRASE
+ No passphrase was supplied. An application which encounters this
+ message may want to stop parsing immediately because the next message
+ will probably be a BAD_PASSPHRASE. However, if the application
+ is a wrapper around the key edit menu functionality it might not
+ make sense to stop parsing but simply ignoring the following
+ BAD_PASSPHRASE.
+
+ BAD_PASSPHRASE <long keyid>
+ The supplied passphrase was wrong or not given. In the latter case
+ you may have seen a MISSING_PASSPHRASE.
+
+ GOOD_PASSPHRASE
+ The supplied passphrase was good and the secret key material
+ is therefore usable.
+
+ DECRYPTION_FAILED
+ The symmetric decryption failed - one reason could be a wrong
+ passphrase for a symmetrical encrypted message.
+
+ DECRYPTION_OKAY
+ The decryption process succeeded. This means, that either the
+ correct secret key has been used or the correct passphrase
+ for a conventional encrypted message was given. The program
+ itself may return an errorcode because it may not be possible to
+ verify a signature for some reasons.
+
+ NO_PUBKEY <long keyid>
+ NO_SECKEY <long keyid>
+ The key is not available
+
+ IMPORT_CHECK <long keyid> <fingerprint> <user ID>
+ This status is emitted in interactive mode right before
+ the "import.okay" prompt.
+
+ IMPORTED <long keyid> <username>
+ The keyid and name of the signature just imported
+
+ IMPORT_OK <reason> [<fingerprint>]
+ The key with the primary key's FINGERPRINT has been imported.
+ Reason flags:
+ 0 := Not actually changed
+ 1 := Entirely new key.
+ 2 := New user IDs
+ 4 := New signatures
+ 8 := New subkeys
+ 16 := Contains private key.
+ The flags may be ORed.
+
+ IMPORT_PROBLEM <reason> [<fingerprint>]
+ Issued for each import failure. Reason codes are:
+ 0 := "No specific reason given".
+ 1 := "Invalid Certificate".
+ 2 := "Issuer Certificate missing".
+ 3 := "Certificate Chain too long".
+ 4 := "Error storing certificate".
+
+ IMPORT_RES <count> <no_user_id> <imported> <imported_rsa> <unchanged>
+ <n_uids> <n_subk> <n_sigs> <n_revoc> <sec_read> <sec_imported> <sec_dups> <not_imported>
+ Final statistics on import process (this is one long line)
+
+ FILE_START <what> <filename>
+ Start processing a file <filename>. <what> indicates the performed
+ operation:
+ 1 - verify
+ 2 - encrypt
+ 3 - decrypt
+
+ FILE_DONE
+ Marks the end of a file processing which has been started
+ by FILE_START.
+
+ BEGIN_DECRYPTION
+ END_DECRYPTION
+ Mark the start and end of the actual decryption process. These
+ are also emitted when in --list-only mode.
+
+ BEGIN_ENCRYPTION <mdc_method> <sym_algo>
+ END_ENCRYPTION
+ Mark the start and end of the actual encryption process.
+
+ BEGIN_SIGNING
+ Mark the start of the actual signing process. This may be used
+ as an indication that all requested secret keys are ready for
+ use.
+
+ DELETE_PROBLEM reason_code
+ Deleting a key failed. Reason codes are:
+ 1 - No such key
+ 2 - Must delete secret key first
+ 3 - Ambigious specification
+
+ PROGRESS what char cur total
+ Used by the primegen and Public key functions to indicate progress.
+ "char" is the character displayed with no --status-fd enabled, with
+ the linefeed replaced by an 'X'. "cur" is the current amount
+ done and "total" is amount to be done; a "total" of 0 indicates that
+ the total amount is not known. 100/100 may be used to detect the
+ end of operation.
+ Well known values for WHAT:
+ "pk_dsa" - DSA key generation
+ "pk_elg" - Elgamal key generation
+ "primegen" - Prime generation
+ "need_entropy" - Waiting for new entropy in the RNG
+ "file:XXX" - processing file XXX
+ (note that current gpg versions leave out the
+ "file:" prefix).
+ "tick" - generic tick without any special meaning - useful
+ for letting clients know that the server is
+ still working.
+ "starting_agent" - A gpg-agent was started because it is not
+ running as a daemon.
+
+
+ SIG_CREATED <type> <pubkey algo> <hash algo> <class> <timestamp> <key fpr>
+ A signature has been created using these parameters.
+ type: 'D' = detached
+ 'C' = cleartext
+ 'S' = standard
+ (only the first character should be checked)
+ class: 2 hex digits with the signature class
+
+ Note, that TIMESTAMP may either be a number with seconds since
+ epoch or an ISO 8601 string which can be detected by the
+ presence of the letter 'T' inside.
+
+ KEY_CREATED <type> <fingerprint> [<handle>]
+ A key has been created
+ type: 'B' = primary and subkey
+ 'P' = primary
+ 'S' = subkey
+ The fingerprint is one of the primary key for type B and P and
+ the one of the subkey for S. Handle is an arbitrary
+ non-whitespace string used to match key parameters from batch
+ key creation run.
+
+ KEY_NOT_CREATED [<handle>]
+ The key from batch run has not been created due to errors.
+
+
+ SESSION_KEY <algo>:<hexdigits>
+ The session key used to decrypt the message. This message will
+ only be emitted when the special option --show-session-key
+ is used. The format is suitable to be passed to the option
+ --override-session-key
+
+ NOTATION_NAME <name>
+ NOTATION_DATA <string>
+ name and string are %XX escaped; the data may be splitted
+ among several notation_data lines.
+
+ USERID_HINT <long main keyid> <string>
+ Give a hint about the user ID for a certain keyID.
+
+ POLICY_URL <string>
+ string is %XX escaped
+
+ BEGIN_STREAM
+ END_STREAM
+ Issued by pipemode.
+
+ INV_RECP <reason> <requested_recipient>
+ Issued for each unusable recipient. The reasons codes
+ currently in use are:
+ 0 := "No specific reason given".
+ 1 := "Not Found"
+ 2 := "Ambigious specification"
+ 3 := "Wrong key usage"
+ 4 := "Key revoked"
+ 5 := "Key expired"
+ 6 := "No CRL known"
+ 7 := "CRL too old"
+ 8 := "Policy mismatch"
+ 9 := "Not a secret key"
+ 10 := "Key not trusted"
+
+ Note that this status is also used for gpgsm's SIGNER command
+ where it relates to signer's of course.
+
+ NO_RECP <reserved>
+ Issued when no recipients are usable.
+
+ ALREADY_SIGNED <long-keyid>
+ Warning: This is experimental and might be removed at any time.
+
+ TRUNCATED <maxno>
+ The output was truncated to MAXNO items. This status code is issued
+ for certain external requests
+
+ ERROR <error location> <error code>
+
+ This is a generic error status message, it might be followed
+ by error location specific data. <error token> and
+ <error_location> should not contain a space. The error code
+ is a either a string commencing with a letter or such string
+ prefix with a numerical error code and an underscore; e.g.:
+ "151011327_EOF"
+
+ ATTRIBUTE <fpr> <octets> <type> <index> <count>
+ <timestamp> <expiredate> <flags>
+ This is one long line issued for each attribute subpacket when
+ an attribute packet is seen during key listing. <fpr> is the
+ fingerprint of the key. <octets> is the length of the
+ attribute subpacket. <type> is the attribute type
+ (1==image). <index>/<count> indicates that this is the Nth
+ indexed subpacket of count total subpackets in this attribute
+ packet. <timestamp> and <expiredate> are from the
+ self-signature on the attribute packet. If the attribute
+ packet does not have a valid self-signature, then the
+ timestamp is 0. <flags> are a bitwise OR of:
+ 0x01 = this attribute packet is a primary uid
+ 0x02 = this attribute packet is revoked
+ 0x04 = this attribute packet is expired
+
+ CARDCTRL <what> [<serialno>]
+ This is used to control smartcard operations.
+ Defined values for WHAT are:
+ 1 = Request insertion of a card. Serialnumber may be given
+ to request a specific card.
+ 2 = Request removal of a card.
+ 3 = Card with serialnumber detected
+ 4 = No card available.
+ 5 = No card reader available
+
+
+ PLAINTEXT <format> <timestamp> <filename>
+ This indicates the format of the plaintext that is about to be
+ written. The format is a 1 byte hex code that shows the
+ format of the plaintext: 62 ('b') is binary data, 74 ('t') is
+ text data with no character set specified, and 75 ('u') is
+ text data encoded in the UTF-8 character set. The timestamp
+ is in seconds since the epoch. If a filename is available it
+ gets printed as the third argument, percent-escaped as usual.
+
+ PLAINTEXT_LENGTH <length>
+ This indicates the length of the plaintext that is about to be
+ written. Note that if the plaintext packet has partial length
+ encoding it is not possible to know the length ahead of time.
+ In that case, this status tag does not appear.
+
+ SIG_SUBPACKET <type> <flags> <len> <data>
+ This indicates that a signature subpacket was seen. The
+ format is the same as the "spk" record above.
+
+ SC_OP_FAILURE [<code>]
+ An operation on a smartcard definitely failed. Currently
+ there is no indication of the actual error code, but
+ application should be prepared to later accept more arguments.
+ Defined values for CODE are:
+ 0 - unspecified error (identically to a missing CODE)
+ 1 - canceled
+ 2 - bad PIN
+
+ SC_OP_SUCCESS
+ A smart card operaion succeeded. This status is only printed
+ for certain operation and is mostly useful to check whether a
+ PIN change really worked.
+
+ BACKUP_KEY_CREATED fingerprint fname
+ A backup key named FNAME has been created for the key with
+ KEYID.
+
+
+Format of the "--attribute-fd" output
+=====================================
+
+When --attribute-fd is set, during key listings (--list-keys,
+--list-secret-keys) GnuPG dumps each attribute packet to the file
+descriptor specified. --attribute-fd is intended for use with
+--status-fd as part of the required information is carried on the
+ATTRIBUTE status tag (see above).
+
+The contents of the attribute data is specified by 2440bis, but for
+convenience, here is the Photo ID format, as it is currently the only
+attribute defined:
+
+ Byte 0-1: The length of the image header. Due to a historical
+ accident (i.e. oops!) back in the NAI PGP days, this is
+ a little-endian number. Currently 16 (0x10 0x00).
+
+ Byte 2: The image header version. Currently 0x01.
+
+ Byte 3: Encoding format. 0x01 == JPEG.
+
+ Byte 4-15: Reserved, and currently unused.
+
+ All other data after this header is raw image (JPEG) data.
+
+
+Format of the "--list-config" output
+====================================
+
+--list-config outputs information about the GnuPG configuration for
+the benefit of frontends or other programs that call GnuPG. There are
+several list-config items, all colon delimited like the rest of the
+--with-colons output. The first field is always "cfg" to indicate
+configuration information. The second field is one of (with
+examples):
+
+version: the third field contains the version of GnuPG.
+
+ cfg:version:1.3.5
+
+pubkey: the third field contains the public key algorithmdcaiphers
+ this version of GnuPG supports, separated by semicolons. The
+ algorithm numbers are as specified in RFC-2440.
+
+ cfg:pubkey:1;2;3;16;17
+
+cipher: the third field contains the symmetric ciphers this version of
+ GnuPG supports, separated by semicolons. The cipher numbers
+ are as specified in RFC-2440.
+
+ cfg:cipher:2;3;4;7;8;9;10
+
+digest: the third field contains the digest (hash) algorithms this
+ version of GnuPG supports, separated by semicolons. The
+ digest numbers are as specified in RFC-2440.
+
+ cfg:digest:1;2;3;8;9;10
+
+compress: the third field contains the compression algorithms this
+ version of GnuPG supports, separated by semicolons. The
+ algorithm numbers are as specified in RFC-2440.
+
+ cfg:compress:0;1;2;3
+
+group: the third field contains the name of the group, and the fourth
+ field contains the values that the group expands to, separated
+ by semicolons.
+
+For example, a group of:
+ group mynames = paige 0x12345678 joe patti
+
+would result in:
+ cfg:group:mynames:patti;joe;0x12345678;paige
+
+
+Key generation
+==============
+ Key generation shows progress by printing different characters to
+ stderr:
+ "." Last 10 Miller-Rabin tests failed
+ "+" Miller-Rabin test succeeded
+ "!" Reloading the pool with fresh prime numbers
+ "^" Checking a new value for the generator
+ "<" Size of one factor decreased
+ ">" Size of one factor increased
+
+ The prime number for Elgamal is generated this way:
+
+ 1) Make a prime number q of 160, 200, 240 bits (depending on the keysize)
+ 2) Select the length of the other prime factors to be at least the size
+ of q and calculate the number of prime factors needed
+ 3) Make a pool of prime numbers, each of the length determined in step 2
+ 4) Get a new permutation out of the pool or continue with step 3
+ if we have tested all permutations.
+ 5) Calculate a candidate prime p = 2 * q * p[1] * ... * p[n] + 1
+ 6) Check that this prime has the correct length (this may change q if
+ it seems not to be possible to make a prime of the desired length)
+ 7) Check whether this is a prime using trial divisions and the
+ Miller-Rabin test.
+ 8) Continue with step 4 if we did not find a prime in step 7.
+ 9) Find a generator for that prime.
+
+ This algorithm is based on Lim and Lee's suggestion from the
+ Crypto '97 proceedings p. 260.
+
+
+Unattended key generation
+=========================
+This feature allows unattended generation of keys controlled by a
+parameter file. To use this feature, you use --gen-key together with
+--batch and feed the parameters either from stdin or from a file given
+on the commandline.
+
+The format of this file is as follows:
+ o Text only, line length is limited to about 1000 chars.
+ o You must use UTF-8 encoding to specify non-ascii characters.
+ o Empty lines are ignored.
+ o Leading and trailing spaces are ignored.
+ o A hash sign as the first non white space character indicates a comment line.
+ o Control statements are indicated by a leading percent sign, the
+ arguments are separated by white space from the keyword.
+ o Parameters are specified by a keyword, followed by a colon. Arguments
+ are separated by white space.
+ o The first parameter must be "Key-Type", control statements
+ may be placed anywhere.
+ o Key generation takes place when either the end of the parameter file
+ is reached, the next "Key-Type" parameter is encountered or at the
+ control statement "%commit"
+ o Control statements:
+ %echo <text>
+ Print <text>.
+ %dry-run
+ Suppress actual key generation (useful for syntax checking).
+ %commit
+ Perform the key generation. An implicit commit is done
+ at the next "Key-Type" parameter.
+ %pubring <filename>
+ %secring <filename>
+ Do not write the key to the default or commandline given
+ keyring but to <filename>. This must be given before the first
+ commit to take place, duplicate specification of the same filename
+ is ignored, the last filename before a commit is used.
+ The filename is used until a new filename is used (at commit points)
+ and all keys are written to that file. If a new filename is given,
+ this file is created (and overwrites an existing one).
+ Both control statements must be given.
+ o The order of the parameters does not matter except for "Key-Type"
+ which must be the first parameter. The parameters are only for the
+ generated keyblock and parameters from previous key generations are not
+ used. Some syntactically checks may be performed.
+ The currently defined parameters are:
+ Key-Type: <algo-number>|<algo-string>
+ Starts a new parameter block by giving the type of the
+ primary key. The algorithm must be capable of signing.
+ This is a required parameter.
+ Key-Length: <length-in-bits>
+ Length of the key in bits. Default is 1024.
+ Key-Usage: <usage-list>
+ Space or comma delimited list of key usage, allowed values are
+ "encrypt", "sign", and "auth". This is used to generate the
+ key flags. Please make sure that the algorithm is capable of
+ this usage. Note that OpenPGP requires that all primary keys
+ are capable of certification, so no matter what usage is given
+ here, the "cert" flag will be on. If no Key-Usage is
+ specified, all the allowed usages for that particular
+ algorithm are used.
+ Subkey-Type: <algo-number>|<algo-string>
+ This generates a secondary key. Currently only one subkey
+ can be handled.
+ Subkey-Length: <length-in-bits>
+ Length of the subkey in bits. Default is 1024.
+ Subkey-Usage: <usage-list>
+ Similar to Key-Usage.
+ Passphrase: <string>
+ If you want to specify a passphrase for the secret key,
+ enter it here. Default is not to use any passphrase.
+ Name-Real: <string>
+ Name-Comment: <string>
+ Name-Email: <string>
+ The 3 parts of a key. Remember to use UTF-8 here.
+ If you don't give any of them, no user ID is created.
+ Expire-Date: <iso-date>|(<number>[d|w|m|y])
+ Set the expiration date for the key (and the subkey). It
+ may either be entered in ISO date format (2000-08-15) or as
+ number of days, weeks, month or years. Without a letter days
+ are assumed.
+ Preferences: <string>
+ Set the cipher, hash, and compression preference values for
+ this key. This expects the same type of string as "setpref"
+ in the --edit menu.
+ Revoker: <algo>:<fpr> [sensitive]
+ Add a designated revoker to the generated key. Algo is the
+ public key algorithm of the designated revoker (i.e. RSA=1,
+ DSA=17, etc.) Fpr is the fingerprint of the designated
+ revoker. The optional "sensitive" flag marks the designated
+ revoker as sensitive information. Only v4 keys may be
+ designated revokers.
+ Handle: <string>
+ This is an optional parameter only used with the status lines
+ KEY_CREATED and KEY_NOT_CREATED. STRING may be up to 100
+ characters and should not contain spaces. It is useful for
+ batch key generation to associate a key parameter block with a
+ status line.
+ Keyserver: <string>
+ This is an optional parameter that specifies the preferred
+ keyserver URL for the key.
+
+
+Here is an example:
+$ cat >foo <<EOF
+ %echo Generating a standard key
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG-E
+ Subkey-Length: 1024
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+EOF
+$ gpg --batch --gen-key foo
+ [...]
+$ gpg --no-default-keyring --secret-keyring ./foo.sec \
+ --keyring ./foo.pub --list-secret-keys
+/home/wk/work/gnupg-stable/scratch/foo.sec
+------------------------------------------
+sec 1024D/915A878D 2000-03-09 Joe Tester (with stupid passphrase) <joe at foo.bar>
+ssb 1024g/8F70E2C0 2000-03-09
+
+
+
+Layout of the TrustDB
+=====================
+The TrustDB is built from fixed length records, where the first byte
+describes the record type. All numeric values are stored in network
+byte order. The length of each record is 40 bytes. The first record of
+the DB is always of type 1 and this is the only record of this type.
+
+FIXME: The layout changed, document it here.
+
+ Record type 0:
+ --------------
+ Unused record, can be reused for any purpose.
+
+ Record type 1:
+ --------------
+ Version information for this TrustDB. This is always the first
+ record of the DB and the only one with type 1.
+ 1 byte value 1
+ 3 bytes 'gpg' magic value
+ 1 byte Version of the TrustDB (2)
+ 1 byte marginals needed
+ 1 byte completes needed
+ 1 byte max_cert_depth
+ The three items are used to check whether the cached
+ validity value from the dir record can be used.
+ 1 u32 locked flags [not used]
+ 1 u32 timestamp of trustdb creation
+ 1 u32 timestamp of last modification which may affect the validity
+ of keys in the trustdb. This value is checked against the
+ validity timestamp in the dir records.
+ 1 u32 timestamp of last validation [currently not used]
+ (Used to keep track of the time, when this TrustDB was checked
+ against the pubring)
+ 1 u32 record number of keyhashtable [currently not used]
+ 1 u32 first free record
+ 1 u32 record number of shadow directory hash table [currently not used]
+ It does not make sense to combine this table with the key table
+ because the keyid is not in every case a part of the fingerprint.
+ 1 u32 record number of the trusthashtbale
+
+
+ Record type 2: (directory record)
+ --------------
+ Informations about a public key certificate.
+ These are static values which are never changed without user interaction.
+
+ 1 byte value 2
+ 1 byte reserved
+ 1 u32 LID . (This is simply the record number of this record.)
+ 1 u32 List of key-records (the first one is the primary key)
+ 1 u32 List of uid-records
+ 1 u32 cache record
+ 1 byte ownertrust
+ 1 byte dirflag
+ 1 byte maximum validity of all the user ids
+ 1 u32 time of last validity check.
+ 1 u32 Must check when this time has been reached.
+ (0 = no check required)
+
+
+ Record type 3: (key record)
+ --------------
+ Informations about a primary public key.
+ (This is mainly used to lookup a trust record)
+
+ 1 byte value 3
+ 1 byte reserved
+ 1 u32 LID
+ 1 u32 next - next key record
+ 7 bytes reserved
+ 1 byte keyflags
+ 1 byte pubkey algorithm
+ 1 byte length of the fingerprint (in bytes)
+ 20 bytes fingerprint of the public key
+ (This is the value we use to identify a key)
+
+ Record type 4: (uid record)
+ --------------
+ Informations about a userid
+ We do not store the userid but the hash value of the userid because that
+ is sufficient.
+
+ 1 byte value 4
+ 1 byte reserved
+ 1 u32 LID points to the directory record.
+ 1 u32 next next userid
+ 1 u32 pointer to preference record
+ 1 u32 siglist list of valid signatures
+ 1 byte uidflags
+ 1 byte validity of the key calculated over this user id
+ 20 bytes ripemd160 hash of the username.
+
+
+ Record type 5: (pref record)
+ --------------
+ This record type is not anymore used.
+
+ 1 byte value 5
+ 1 byte reserved
+ 1 u32 LID; points to the directory record (and not to the uid record!).
+ (or 0 for standard preference record)
+ 1 u32 next
+ 30 byte preference data
+
+ Record type 6 (sigrec)
+ -------------
+ Used to keep track of key signatures. Self-signatures are not
+ stored. If a public key is not in the DB, the signature points to
+ a shadow dir record, which in turn has a list of records which
+ might be interested in this key (and the signature record here
+ is one).
+
+ 1 byte value 6
+ 1 byte reserved
+ 1 u32 LID points back to the dir record
+ 1 u32 next next sigrec of this uid or 0 to indicate the
+ last sigrec.
+ 6 times
+ 1 u32 Local_id of signatures dir or shadow dir record
+ 1 byte Flag: Bit 0 = checked: Bit 1 is valid (we have a real
+ directory record for this)
+ 1 = valid is set (but may be revoked)
+
+
+
+ Record type 8: (shadow directory record)
+ --------------
+ This record is used to reserve a LID for a public key. We
+ need this to create the sig records of other keys, even if we
+ do not yet have the public key of the signature.
+ This record (the record number to be more precise) will be reused
+ as the dir record when we import the real public key.
+
+ 1 byte value 8
+ 1 byte reserved
+ 1 u32 LID (This is simply the record number of this record.)
+ 2 u32 keyid
+ 1 byte pubkey algorithm
+ 3 byte reserved
+ 1 u32 hintlist A list of records which have references to
+ this key. This is used for fast access to
+ signature records which are not yet checked.
+ Note, that this is only a hint and the actual records
+ may not anymore hold signature records for that key
+ but that the code cares about this.
+ 18 byte reserved
+
+
+
+ Record Type 10 (hash table)
+ --------------
+ Due to the fact that we use fingerprints to lookup keys, we can
+ implement quick access by some simple hash methods, and avoid
+ the overhead of gdbm. A property of fingerprints is that they can be
+ used directly as hash values. (They can be considered as strong
+ random numbers.)
+ What we use is a dynamic multilevel architecture, which combines
+ hashtables, record lists, and linked lists.
+
+ This record is a hashtable of 256 entries; a special property
+ is that all these records are stored consecutively to make one
+ big table. The hash value is simple the 1st, 2nd, ... byte of
+ the fingerprint (depending on the indirection level).
+
+ When used to hash shadow directory records, a different table is used
+ and indexed by the keyid.
+
+ 1 byte value 10
+ 1 byte reserved
+ n u32 recnum; n depends on the record length:
+ n = (reclen-2)/4 which yields 9 for the current record length
+ of 40 bytes.
+
+ the total number of such record which makes up the table is:
+ m = (256+n-1) / n
+ which is 29 for a record length of 40.
+
+ To look up a key we use the first byte of the fingerprint to get
+ the recnum from this hashtable and look up the addressed record:
+ - If this record is another hashtable, we use 2nd byte
+ to index this hash table and so on.
+ - if this record is a hashlist, we walk all entries
+ until we found one a matching one.
+ - if this record is a key record, we compare the
+ fingerprint and to decide whether it is the requested key;
+
+
+ Record type 11 (hash list)
+ --------------
+ see hash table for an explanation.
+ This is also used for other purposes.
+
+ 1 byte value 11
+ 1 byte reserved
+ 1 u32 next next hash list record
+ n times n = (reclen-5)/5
+ 1 u32 recnum
+
+ For the current record length of 40, n is 7
+
+
+
+ Record type 254 (free record)
+ ---------------
+ All these records form a linked list of unused records.
+ 1 byte value 254
+ 1 byte reserved (0)
+ 1 u32 next_free
+
+
+
+Packet Headers
+===============
+
+GNUPG uses PGP 2 packet headers and also understands OpenPGP packet header.
+There is one enhancement used with the old style packet headers:
+
+ CTB bits 10, the "packet-length length bits", have values listed in
+ the following table:
+
+ 00 - 1-byte packet-length field
+ 01 - 2-byte packet-length field
+ 10 - 4-byte packet-length field
+ 11 - no packet length supplied, unknown packet length
+
+ As indicated in this table, depending on the packet-length length
+ bits, the remaining 1, 2, 4, or 0 bytes of the packet structure field
+ are a "packet-length field". The packet-length field is a whole
+ number field. The value of the packet-length field is defined to be
+ the value of the whole number field.
+
+ A value of 11 is currently used in one place: on compressed data.
+ That is, a compressed data block currently looks like <A3 01 . . .>,
+ where <A3>, binary 10 1000 11, is an indefinite-length packet. The
+ proper interpretation is "until the end of the enclosing structure",
+ although it should never appear outermost (where the enclosing
+ structure is a file).
+
++ This will be changed with another version, where the new meaning of
++ the value 11 (see below) will also take place.
++
++ A value of 11 for other packets enables a special length encoding,
++ which is used in case, where the length of the following packet can
++ not be determined prior to writing the packet; especially this will
++ be used if large amounts of data are processed in filter mode.
++
++ It works like this: After the CTB (with a length field of 11) a
++ marker field is used, which gives the length of the following datablock.
++ This is a simple 2 byte field (MSB first) containing the amount of data
++ following this field, not including this length field. After this datablock
++ another length field follows, which gives the size of the next datablock.
++ A value of 0 indicates the end of the packet. The maximum size of a
++ data block is limited to 65534, thereby reserving a value of 0xffff for
++ future extensions. These length markers must be inserted into the data
++ stream just before writing the data out.
++
++ This 2 byte field is large enough, because the application must buffer
++ this amount of data to prepend the length marker before writing it out.
++ Data block sizes larger than about 32k doesn't make any sense. Note
++ that this may also be used for compressed data streams, but we must use
++ another packet version to tell the application that it can not assume,
++ that this is the last packet.
+
+
+GNU extensions to the S2K algorithm
+===================================
+S2K mode 101 is used to identify these extensions.
+After the hash algorithm the 3 bytes "GNU" are used to make
+clear that these are extensions for GNU, the next bytes gives the
+GNU protection mode - 1000. Defined modes are:
+ 1001 - do not store the secret part at all
+ 1002 - a stub to access smartcards (not used in 1.2.x)
+
+
+Pipemode
+========
+NOTE: This is deprecated and will be removed in future versions.
+
+This mode can be used to perform multiple operations with one call to
+gpg. It comes handy in cases where you have to verify a lot of
+signatures. Currently we support only detached signatures. This mode
+is a kludge to avoid running gpg n daemon mode and using Unix Domain
+Sockets to pass the data to it. There is no easy portable way to do
+this under Windows, so we use plain old pipes which do work well under
+Windows. Because there is no way to signal multiple EOFs in a pipe we
+have to embed control commands in the data stream: We distinguish
+between a data state and a control state. Initially the system is in
+data state but it won't accept any data. Instead it waits for
+transition to control state which is done by sending a single '@'
+character. While in control state the control command os expected and
+this command is just a single byte after which the system falls back
+to data state (but does not necesary accept data now). The simplest
+control command is a '@' which just inserts this character into the
+data stream.
+
+Here is the format we use for detached signatures:
+"@<" - Begin of new stream
+"@B" - Detached signature follows.
+ This emits a control packet (1,'B')
+<detached_signature>
+"@t" - Signed text follows.
+ This emits the control packet (2, 'B')
+<signed_text>
+"@." - End of operation. The final control packet forces signature
+ verification
+"@>" - End of stream
+
+
+
+
+
+
+Other Notes
+===========
+ * For packet version 3 we calculate the keyids this way:
+ RSA := low 64 bits of n
+ ELGAMAL := build a v3 pubkey packet (with CTB 0x99) and calculate
+ a rmd160 hash value from it. This is used as the
+ fingerprint and the low 64 bits are the keyid.
+
+ * Revocation certificates consist only of the signature packet;
+ "import" knows how to handle this. The rationale behind it is
+ to keep them small.
+
+
+
+
+
+
+
+Keyserver Message Format
+=========================
+
+The keyserver may be contacted by a Unix Domain socket or via TCP.
+
+The format of a request is:
+
+====
+command-tag
+"Content-length:" digits
+CRLF
+=======
+
+Where command-tag is
+
+NOOP
+GET <user-name>
+PUT
+DELETE <user-name>
+
+
+The format of a response is:
+
+======
+"GNUPG/1.0" status-code status-text
+"Content-length:" digits
+CRLF
+============
+followed by <digits> bytes of data
+
+
+Status codes are:
+
+ o 1xx: Informational - Request received, continuing process
+
+ o 2xx: Success - The action was successfully received, understood,
+ and accepted
+
+ o 4xx: Client Error - The request contains bad syntax or cannot be
+ fulfilled
+
+ o 5xx: Server Error - The server failed to fulfill an apparently
+ valid request
+
+
+
+Documentation on HKP (the http keyserver protocol):
+
+A minimalistic HTTP server on port 11371 recognizes a GET for /pks/lookup.
+The standard http URL encoded query parameters are this (always key=value):
+
+- op=index (like pgp -kv), op=vindex (like pgp -kvv) and op=get (like
+ pgp -kxa)
+
+- search=<stringlist>. This is a list of words that must occur in the key.
+ The words are delimited with space, points, @ and so on. The delimiters
+ are not searched for and the order of the words doesn't matter (but see
+ next option).
+
+- exact=on. This switch tells the hkp server to only report exact matching
+ keys back. In this case the order and the "delimiters" are important.
+
+- fingerprint=on. Also reports the fingerprints when used with 'index' or
+ 'vindex'
+
+The keyserver also recognizes http-POSTs to /pks/add. Use this to upload
+keys.
+
+
+A better way to do this would be a request like:
+
+ /pks/lookup/<gnupg_formatierte_user_id>?op=<operation>
+
+This can be implemented using Hurd's translator mechanism.
+However, I think the whole key server stuff has to be re-thought;
+I have some ideas and probably create a white paper.
+
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/rql_parser_machine.graphviz
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/rql_parser_machine.graphviz (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/docs/design_docs/rql_parser_machine.graphviz Fri Apr 20 13:49:12 2007
@@ -2,6 +2,9 @@
/* GraphViz graph representing the state diagram of the RQL parser.
*/
+/* XXX: It's not up to date anymore, we should delete it or update.
+*/
+
digraph G {
PAREN -> PAREN;
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_Config.pm.in (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_Config.pm.in Fri Apr 20 13:49:12 2007
@@ -284,6 +284,30 @@
# }}}
+# {{{ GnuPG
+
+Set( %GnuPG,
+ Enable => 0,
+ OutgoingMessagesFormat => 'RFC', # Inline
+);
+
+# Options of GnuPG program
+
+Set(%GnuPGOptions,
+ homedir => '@RT_VAR_PATH@/data/gpg',
+
+# URL of a keyserver
+# keyserver => 'hkp://subkeys.pgp.net',
+
+# enables the automatic retrieving of keys when encrypting
+# 'auto-key-locate' => 'keyserver',
+
+# enables the automatic retrieving of keys when verifying signatures
+# 'auto-key-retrieve' => undef,
+);
+
+# }}}
+
# {{{ Logging
# Logging. The default is to log anything except debugging
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_SiteConfig.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_SiteConfig.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/RT_SiteConfig.pm Fri Apr 20 13:49:12 2007
@@ -1,18 +1,22 @@
-# Any configuration directives you include here will override
-# RT's default configuration file, RT_Config.pm
-#
-# To include a directive here, just copy the equivalent statement
-# from RT_Config.pm and change the value. We've included a single
-# sample value below.
-#
-# This file is actually a perl module, so you can include valid
-# perl code, as well.
-#
-# The converse is also true, if this file isn't valid perl, you're
-# going to run into trouble. To check your SiteConfig file, use
-# this comamnd:
-#
-# perl -c /path/to/your/etc/RT_SiteConfig.pm
Set( $rtname, 'example.com');
+Set( $WebPort , 11235);
+Set( $WebBaseURL , "http://localhost:$WebPort");
+
+ $RTIR_CONFIG_FILE = $RT::LocalEtcPath."/IR/RTIR_Config.pm";
+
+ require $RTIR_CONFIG_FILE
+ || die ("Couldn't load RTIR config file '$RTIR_CONFIG_FILE'\n$@");
+
+Set( %GnuPG,
+ Enable => 1,
+ OutgoingMessagesFormat => 'RFC', # Inline
+);
+
+
+Set(%GnuPGOptions, homedir => '/home/clkao/.gnupg');
+Set(@MailPlugins, 'Auth::GnuPGNG');
+
+
1;
+
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/initialdata
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/initialdata (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/etc/initialdata Fri Apr 20 13:49:12 2007
@@ -392,6 +392,31 @@
Your ticket has been rejected by { eval { $Approval->OwnerObj->Name } }.
'
},
+ { Queue => 0,
+ Name => "Error: public key", # loc
+ Description =>
+ "Inform user that he has problems with public key and couldn't recieve encrypted content", # loc
+ Content => q{Subject: We have no your public key or it's wrong
+
+You received this message as we have no your public PGP key or we have a problem with your key. Inform the administrator about the problem.
+}
+ },
+ { Queue => 0,
+ Name => "Error to RT owner: public key", # loc
+ Description =>
+ "Inform RT owner that user(s) have problems with public keys", # loc
+ Content => q{Subject: Some users have problems with public keys
+
+You received this message as RT has problems with public keys of the following user:
+{
+ my $res = '';
+ foreach my $e ( @BadRecipients ) {
+ $res .= "* ". $e->{'Message'} ."\n";
+ }
+ $res
+}
+}
+ },
);
# }}}
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectOwner (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectOwner Fri Apr 20 13:49:12 2007
@@ -48,7 +48,7 @@
<option <% !$Default ? "SELECTED" : '' %> value=""><%$DefaultLabel%></option>
%}
%foreach my $User ( @users) {
-<option <% ($User->Id == $Default) ? "SELECTED" : ''%>
+<option <% (defined $Default && $User->Id == $Default) ? "SELECTED" : ''%>
%if ($ValueAttribute eq 'id') {
value="<%$User->id%>"
%} elsif ($ValueAttribute eq 'Name') {
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectStatus
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectStatus (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/SelectStatus Fri Apr 20 13:49:12 2007
@@ -49,7 +49,7 @@
%}
%foreach my $status (@status) {
%next if ($SkipDeleted && $status eq 'deleted');
-<option <% ($status eq $Default) && "SELECTED" %> value="<%$status%>"><%loc($status)%></option>
+<option <% (defined $Default && $status eq $Default) && "SELECTED" %> value="<%$status%>"><%loc($status)%></option>
% }
</select>
<%ONCE>
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowUser
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowUser (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowUser Fri Apr 20 13:49:12 2007
@@ -44,20 +44,26 @@
%#
%# END BPS TAGGED BLOCK }}}
%# Released under the terms of version 2 of the GNU Public License
-<% $obj->format %>\
+<% $Address->format %>\
<%INIT>
my ($phrase, $address, $comment);
+
+if ($User) {
$address = $User->EmailAddress;
$phrase = $User->RealName
if $User->RealName && lc $User->RealName ne lc $address;
$comment = $User->Name if lc $User->Name ne lc $address;
-my $obj = Mail::Address->new( $phrase, $address, $comment );
-$obj->comment('') if $comment && lc $obj->user eq lc $comment;
+ $Address = Mail::Address->new( $phrase, $address, $comment );
+}
+
+
+$Address->comment('') if $comment && lc $Address->user eq lc $comment;
if ( $phrase and my ($l, $r) = ($phrase =~ /^(\w+) (\w+)$/) ) {
- $obj->phrase('') if $obj->user =~ /^\Q$l\E.\Q$r\E$/
- || $obj->user =~ /^\Q$r\E.\Q$l\E$/;
+ $Address->phrase('') if $Address->user =~ /^\Q$l\E.\Q$r\E$/
+ || $Address->user =~ /^\Q$r\E.\Q$l\E$/;
}
</%INIT>
<%ARGS>
$User => undef
+$Address => undef
</%ARGS>
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/NoAuth/js/util.js
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/NoAuth/js/util.js (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/NoAuth/js/util.js Fri Apr 20 13:49:12 2007
@@ -259,3 +259,18 @@
}
}
}
+
+function checkboxToInput(target,checkbox,val){
+ var tar=$(target);
+ var box = $(checkbox);
+ if(box.checked){
+ if (tar.value==''){
+ tar.value=val;
+ }else{
+ tar.value=val+', '+tar.value; }
+ }else{
+ tar.value=tar.value.replace(val+', ','');
+ tar.value=tar.value.replace(val,'');
+ }
+}
+
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/SelfService/Display.html Fri Apr 20 13:49:12 2007
@@ -74,6 +74,7 @@
Ticket => $Ticket,
URIFile => "Display.html",
ShowHeaders => $ARGS{'ShowHeaders'},
+ DownloadableHeaders => 0,
AttachPath => "Attachment",
Attachments => $attachments,
UpdatePath => "Update.html"
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Create.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Create.html Fri Apr 20 13:49:12 2007
@@ -259,7 +259,7 @@
foreach ( qw(Sign Encrypt) ) {
$ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
Name => $_,
- CurrentValue => $QueueObj->$_,
+ DefaultValue => $QueueObj->$_,
Arguments => \%ARGS,
);
}
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/PreviewScrips (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/PreviewScrips Fri Apr 20 13:49:12 2007
@@ -67,7 +67,7 @@
my $action;
-if (( $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} eq 'Respond' )) {
+if (($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} && $ARGS{'Action'} eq 'Respond' )) {
$action = 'Correspond';
}
else {
@@ -100,7 +100,7 @@
% foreach my $scrip (@{$Object->Scrips->Prepared}) {
% next unless $scrip->ActionObj->Action->isa('RT::Action::SendEmail');
-<b><% $scrip->Description %></b><br />
+<b><% $scrip->Description || loc('Scrip #[_1]',$scrip->id) %></b><br />
<&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
<br />
%foreach my $type qw(To Cc Bcc) {
Added: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowGnuPGStatus
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowGnuPGStatus Fri Apr 20 13:49:12 2007
@@ -0,0 +1,50 @@
+<table class="crypt-runs">
+<tr><td align="right" class="labeltop" rowspan="<% scalar @messages %>">GnuPG:</td>
+<td><% shift @messages %></td></tr>
+
+% foreach my $msg( @messages ) {
+<tr><td><% $msg %></td></tr>
+% }
+
+</table>
+<%ARGS>
+$Attachment
+</%ARGS>
+<%INIT>
+my @runs;
+foreach ( $Attachment->SplitHeaders ) {
+ next unless s/^X-RT-GnuPG-Status:\s*//i;
+
+ require RT::Crypt::GnuPG;
+ push @runs, [ RT::Crypt::GnuPG::ParseStatus( $_ ) ];
+}
+return unless @runs;
+
+my @messages;
+foreach my $run ( @runs ) {
+ foreach my $line ( @$run ) {
+ next if $line->{'Operation'} eq 'KeyCheck';
+
+ if ( $line->{'Operation'} eq 'PassphraseCheck' ) {
+ next if $line->{'Status'} eq 'DONE';
+ push @messages, loc( $line->{'Message'} );
+ }
+ elsif ( $line->{'Operation'} eq 'Decrypt' ) {
+ next if $line->{'Keyword'} eq 'ENC_TO';
+ push @messages, loc( $line->{'Message'} );
+ }
+ elsif ( $line->{'Operation'} eq 'Verify' ) {
+ push @messages, loc( $line->{'Message'} );
+ }
+ else {
+ next if $line->{'Status'} eq 'DONE';
+ push @messages, loc( $line->{'Message'} );
+ }
+ }
+}
+return unless @messages;
+
+my %seen;
+ at messages = grep !$seen{$_}++, @messages;
+
+</%INIT>
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowMessageStanza
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowMessageStanza (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowMessageStanza Fri Apr 20 13:49:12 2007
@@ -47,7 +47,7 @@
<div class="message-stanza-depth-<% $Depth %>">
<%perl>
my $para = '';
-foreach my $stanza (@$Message) {
+foreach my $stanza ( @$Message) {
if ( ref $stanza eq "ARRAY" ) {
$print_content->( \$para ); $para = '';
$m->comp( 'ShowMessageStanza',
@@ -56,7 +56,7 @@
Message => $stanza );
}
elsif ( ref $stanza eq "HASH" ) {
- $para .= $stanza->{raw};
+ $para .= ($stanza->{raw}||'');
}
}
$print_content->( \$para ) if length $para;
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransaction (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransaction Fri Apr 20 13:49:12 2007
@@ -62,6 +62,9 @@
<tr>
<td colspan="4" class="content">
+% if ( $Attachments->[0] && $Attachments->[0]->id ) {
+ <& ShowGnuPGStatus, Attachment => $Attachments->[0] &>
+% }
% if ( $Transaction->CustomFieldValues->Count ) {
<& /Elements/ShowCustomFields, Object => $Transaction &>
% }
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransactionAttachments
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransactionAttachments (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/ShowTransactionAttachments Fri Apr 20 13:49:12 2007
@@ -56,12 +56,12 @@
if ( $size ) {
</%PERL>
<div class="downloadattachment">
-<a href="<% $AttachPath %>/<% $Transaction->Id %>/<% $message->Id %>/<% $message->Filename | u%>">
-<&|/l&>Download</&> <% $message->Filename || loc('(untitled)') %></a>
-% if ( !$message->Filename && $message->ContentType =~ /text/ ) {
-<span>[<a href="<% $AttachPath %>/WithHeaders/<% $message->Id %>"><% loc('with headers') %></a>]</span>
+<a href="<% $AttachPath %>/<% $Transaction->Id %>/<% $message->Id %>/<% ($message->Filename ||'')| u%>"><&|/l&>Download</&> <% $message->Filename || loc('(untitled)') %></a>
+% if ( $DownloadableHeaders && !$message->Filename && $message->ContentType =~ /text/ ) {
+ / <a href="<% $AttachPath %>/WithHeaders/<% $message->Id %>"><% loc('with headers') %></a>
% }
-<span class="downloadcontenttype">[<% $message->ContentType %> <% $size_to_str->( $size ) %>]</span>
+<br/>
+<span class="downloadcontenttype"><% $message->ContentType %> <% $size_to_str->( $size ) %></span>
</div>
% }
@@ -160,6 +160,7 @@
$Transaction => undef
$ShowHeaders => 0
$Collapsed => undef
+$DownloadableHeaders => 1
$ShowTitleBarCommands => 1
$RowNum => 1
$AttachPath => RT->Config->Get('WebPath')."/Ticket/Attachment"
Added: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/UpdateCc
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/UpdateCc Fri Apr 20 13:49:12 2007
@@ -0,0 +1,38 @@
+<tr><td align="right"><&|/l&>Cc</&>:</td><td> <input name="UpdateCc" id = "UpdateCc" size="60"
+ value="<% $ARGS{UpdateCc}||'' %>" />
+<input type="hidden" id="UpdateIgnoreAddressCheckboxes" name="UpdateIgnoreAddressCheckboxes" value="0">
+ <br />
+
+%foreach my $addr ( keys %txn_addresses) {
+<input
+id="UpdateCc-<%$addr%>"
+name="UpdateCc-<%$addr%>"
+ type="checkbox"
+ onClick="checkboxToInput('UpdateCc', 'UpdateCc-<%$addr%>','<%$txn_addresses{$addr}->format%>' ); $(UpdateIgnoreAddressCheckboxes).value=1"
+ <% $ARGS{'UpdateCc-'.$addr} ? 'checked="checked"' : ''%> > <& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
+%}
+<div class="hints"><i><font size="-2">
+ <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <strong>not</strong> change who will receive future updates.)</&></font></i>
+</div>
+</td></tr>
+<tr><td align="right"><&|/l&>Bcc</&>:</td><td> <input id="UpdateBcc" name="UpdateBcc" size="60" value="<%$ARGS{UpdateBcc}||''%>" /><br />
+%foreach my $addr ( keys %txn_addresses) {
+<input
+ id="UpdateBcc-<%$addr%>"
+ name="UpdateBcc-<%$addr%>"
+ type="checkbox"
+ onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$addr%>','<%$txn_addresses{$addr}->format%>' ); $(UpdateIgnoreAddressCheckboxes).value=1"
+ <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%>>
+<& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
+%}
+ <div class="hints">
+<i><font size="-2">
+ <&|/l&>(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <strong>not</strong> change who will receive future updates.)</&></font></i>
+</div>
+</td></tr>
+<%args>
+$TicketObj
+</%args>
+<%init>
+my %txn_addresses = %{$TicketObj->TransactionAddresses;};
+</%init>
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html Fri Apr 20 13:49:12 2007
@@ -51,9 +51,9 @@
<form action="Update.html" name="TicketUpdate"
method="post" enctype="multipart/form-data">
% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
-<input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction} %>" />
-<input type="hidden" class="hidden" name="DefaultStatus" value="<% $DefaultStatus %>" />
-<input type="hidden" class="hidden" name="Action" value="<% $ARGS{Action} %>" />
+<input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction}||'' %>" />
+<input type="hidden" class="hidden" name="DefaultStatus" value="<% $DefaultStatus ||''%>" />
+<input type="hidden" class="hidden" name="Action" value="<% $ARGS{Action}||'' %>" />
<table border="0">
<tr><td align="right"><&|/l&>Status</&>:</td>
@@ -61,47 +61,28 @@
<& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", loc($TicketObj->Status)), Default => $ARGS{'Status'} || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus)&>
<&|/l&>Owner</&>:
<& /Elements/SelectOwner, Name=>"Owner", DefaultLabel => loc("[_1] (Unchanged)", $TicketObj->OwnerObj->Name()), QueueObj => $TicketObj->QueueObj, TicketObj => $TicketObj, Default => $ARGS{'Owner'} &>
-<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked} %>" />
+<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked}||'' %>" />
<& /Elements/SelectTimeUnits, Name => 'UpdateTimeWorked'&>
</td></tr>
% my $skip;
-% $m->callback( CallbackName => 'BeforeUpdateType', skip => \$skip, %ARGS );
+% $m->callback( %ARGS, CallbackName => 'BeforeUpdateType', skip => \$skip );
% if (!$skip) {
<input type="hidden" class="hidden" name="id" value="<%$TicketObj->Id%>" /><br />
% }
<tr><td align="right"><&|/l&>Update Type</&>:</td>
<td><select name="UpdateType">
% if ($CanComment) {
- <option value="private" <%$ARGS{'UpdateType'} eq "private" ? "SELECTED" : !$ARGS{'UpdateType'}&&$CommentDefault%>><&|/l&>Comments (Not sent to requestors)</&></option>
+<option value="private" <% ($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq "private") ? "SELECTED" : !$ARGS{'UpdateType'}&&$CommentDefault%>><&|/l&>Comments (Not sent to requestors)</&></option>
% }
% if ($CanRespond) {
- <option value="response" <%$ARGS{'UpdateType'} eq "response" ? "SELECTED" : !$ARGS{'UpdateType'}&&$ResponseDefault%>><&|/l&>Reply to requestors</&></option>
+<option value="response" <% ($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq "response") ? "SELECTED" : !$ARGS{'UpdateType'}&&$ResponseDefault%>><&|/l&>Reply to requestors</&></option>
% }
</select>
</td></tr>
<tr><td align="right"><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $TicketObj->Subject()%>" /></td></tr>
-<tr><td align="right"><&|/l&>Cc</&>:</td><td> <input name="UpdateCc" size="60"
-value="<% $ARGS{UpdateCc} %>" /><br />
-<i><font size="-2">
-<&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <strong>not</strong> change who will receive future updates.)</&></font></i>
-</td></tr>
-<tr><td align="right"><&|/l&>Bcc</&>:</td><td> <input name="UpdateBcc" size="60" value="<%$ARGS{UpdateBcc}%>" /><br />
-<i><font size="-2">
-<&|/l&>(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <strong>not</strong> change who will receive future updates.)</&></font></i>
-</td></tr>
-% if (exists $session{'Attachments'}) {
-<td>
-<&|/l&>Attached file</&>:
-</td>
-<td colspan="5">
-<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
-<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
-% } # end of foreach
-</td>
-</tr>
-<tr>
-% } # end of if
+
+<& /Ticket/Elements/UpdateCc, %ARGS, TicketObj => $TicketObj &>
+
% if (my $TxnCFs = $TicketObj->TransactionCustomFields) {
% while (my $CF = $TxnCFs->Next()) {
@@ -113,10 +94,29 @@
% } # end if while
% } # end of if
+% if (exists $session{'Attachments'}) {
+<tr><td><&|/l&>Attached file</&>:</td>
+<td>
+<&|/l&>Check box to delete</&><br />
+% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
+% } # end of foreach
+</td>
+</tr>
+% } # end of if
+
<tr><td align="right"><&|/l&>Attach</&>:</td><td><input name="Attach" type="file" /><input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" /><input type="hidden" class="hidden" name="UpdateAttach" value="1" />
</td></tr>
+
+<tr><td> </td><td><table>
+<td><% loc('Sign')%></td>
+<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $ARGS{'Sign'} &></td>
+<td><% loc('Encrypt')%></td>
+<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $ARGS{'Encrypt'} &></td>
+</table></td></tr>
+
<tr><td align="right" valign="top"><&|/l&>Message</&>:</td><td>
-% $m->callback( CallbackName => 'BeforeMessageBox', %ARGS );
+% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
% if (exists $ARGS{UpdateContent}) {
% # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
% my $temp = $ARGS{'QuoteTransaction'};
@@ -158,17 +158,28 @@
$title = loc("Update ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject);
}
+foreach ( qw(Sign Encrypt) ) {
+ $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
+ Name => $_,
+ DefaultValue => $TicketObj->QueueObj->$_,
+ Arguments => \%ARGS,
+ );
+}
+
# Things needed in the template - we'll do the processing here, just
# for the convenience:
my ($CommentDefault, $ResponseDefault);
if ($Action ne 'Respond') {
$CommentDefault = "SELECTED";
+ $ResponseDefault = "";
} else {
+ $CommentDefault = "";
$ResponseDefault = "SELECTED";
}
+
$CanRespond = 1 if ( $TicketObj->CurrentUserHasRight('ReplyToTicket') or
$TicketObj->CurrentUserHasRight('ModifyTicket') );
@@ -217,6 +228,8 @@
return;
}
+
+
</%INIT>
<%ARGS>
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Action/SendEmail.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Action/SendEmail.pm Fri Apr 20 13:49:12 2007
@@ -238,7 +238,7 @@
. $self->TransactionObj->id
. " - Scrip "
. $self->ScripObj->id . " "
- . $self->ScripObj->Description );
+ . ($self->ScripObj->Description || '') );
#If we don't have any recipients to send to, don't send a message;
unless ( $MIMEObj->head->get('To')
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Attachment_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Attachment_Overlay.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Attachment_Overlay.pm Fri Apr 20 13:49:12 2007
@@ -420,6 +420,42 @@
return $entity;
}
+
+=head2 Addresses
+
+Returns a hashref of all addresses related to this attachment.
+The keys of the hash are C<From>,C<To>,C<Cc>, C<Bcc>, C<RT-Send-Cc> and C<RT-Send-Bcc>. The values are references to lists of Mail::Address objects.
+
+
+=cut
+
+
+sub Addresses {
+ my $self = shift;
+
+ my %data = ();
+ my $current_user_address = lc $self->CurrentUser->EmailAddress;
+ my $correspond = lc $self->TransactionObj->TicketObj->QueueObj->CorrespondAddress;
+ my $comment = lc $self->TransactionObj->TicketObj->QueueObj->CommentAddress;
+ foreach my $hdr (qw(From To Cc Bcc RT-Send-Cc RT-Send-Bcc)) {
+ my @Addresses;
+ my $line = $self->GetHeader($hdr);
+
+ foreach my $AddrObj ( Mail::Address->parse( $line )) {
+ my $address = $AddrObj->address;
+ my $user = RT::User->new($RT::SystemUser);
+ $address = lc $user->CanonicalizeEmailAddress($address);
+ next if ( $current_user_address eq $address );
+ next if ( $comment eq $address );
+ next if ( $correspond eq $address );
+ next if ( RT::EmailParser->IsRTAddress($address) );
+ push @Addresses, $AddrObj ;
+ }
+ $data{$hdr} = \@Addresses;
+ }
+ return \%data;
+}
+
=head2 NiceHeaders
Returns a multi-line string of the To, From, Cc, Date and Subject headers.
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm Fri Apr 20 13:49:12 2007
@@ -56,6 +56,7 @@
Widget => '/Widgets/Form/Select',
WidgetArguments => {
Description => 'Interface style', #loc
+ # XXX: we need support for 'get values callback'
Values => [qw(3.5-default 3.4-compat)],
},
},
@@ -114,6 +115,12 @@
},
},
},
+ GnuPG => {
+ Type => 'HASH'
+ },
+ GnuPGOptions => {
+ Type => 'HASH'
+ },
);
my %OPTIONS = ();
@@ -292,6 +299,23 @@
Takes name of the option as argument and returns its current value.
+Returns different things in scalar and array contexts. For scalar
+options it's not that important, however for arrays and hash it's.
+In scalar context returns references to arrays and hashes.
+
+Use C<scalar> perl's op to force context, especially when you use
+C<(..., Argument => RT->Config->Get('ArrayOpt'), ...)>
+as perl's '=>' op doesn't change context of the right hand argument to
+scalar. Instead use C<(..., Argument => scalar RT->Config->Get('ArrayOpt'), ...)>.
+
+It's also important for options that have no default value(no default
+in F<etc/RT_Config.pm>). If you don't force scalar context then you'll
+get empty list and all your named args will be messed up. For example
+C<(arg1 => 1, arg2 => RT->Config->Get('OptionDoesNotExist'), arg3 => 3)>
+will result in C<(arg1 => 1, arg2 => 'arg3', 3)> what is most probably
+unexpected, or C<(arg1 => 1, arg2 => RT->Config->Get('ArrayOption'), arg3 => 3)>
+will result in C<(arg1 => 1, arg2 => 'element of option', 'another_one' => ..., 'arg3', 3)>.
+
=cut
sub Get
@@ -326,8 +350,11 @@
=head2 Set
-Takes two arguments: name of the option and new value.
-Set option's value to new value.
+Set option's value to new value. Takes name of the option and new value.
+
+The new value should scalar, array or hash depending on type of the option.
+If the option is not defined in meta or the default RT config then it is of
+sclar type.
=cut
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm Fri Apr 20 13:49:12 2007
@@ -8,7 +8,7 @@
use RT::EmailParser ();
# gnupg options supported by GnuPG::Interface
-# other otions should be handled via extra args params
+# other otions should be handled via extra_args argument
my %supported_opt = map { $_ => 1 } qw(
always_trust
armor
@@ -38,9 +38,9 @@
=head2 SignEncrypt Entity => MIME::Entity, [ Encrypt => 1, Sign => 1, Passphrase => undef ]
Signs and/or encrypts an email message with GnuPG utility. A passphrase is required
-only during signing.
+only during signing, if value is undefined then L</GetPassphrase> called to get it.
-Returns a hash with the follwoing keys:
+Returns a hash with the following keys:
* exit_code
* error
@@ -50,7 +50,38 @@
=cut
+sub _safe_run_child (&) {
+ # We need to reopen stdout temporarily, because in FCGI
+ # environment, stdout is tied to FCGI::Stream, and the child
+ # of the run3 wouldn't be able to reopen STDOUT properly.
+ my $stdin = IO::Handle->new;
+ $stdin->fdopen( 0, 'r' );
+ local *STDIN = $stdin;
+
+ my $stdout = IO::Handle->new;
+ $stdout->fdopen( 1, 'w' );
+ local *STDOUT = $stdout;
+
+ my $stderr = IO::Handle->new;
+ $stderr->fdopen( 2, 'w' );
+ local *STDERR = $stderr;
+
+ local $SIG{'CHLD'} = 'DEFAULT';
+ local @ENV{'LANG', 'LC_ALL'} = ('C', 'C');
+ shift->();
+}
+
sub SignEncrypt {
+
+ my $format = lc RT->Config->Get('GnuPG')->{'OutgoingMessagesFormat'} || 'RFC';
+ if ( $format eq 'inline' ) {
+ SignEncryptInline( @_ );
+ } else {
+ SignEncryptRFC3156( @_ );
+ }
+}
+
+sub SignEncryptRFC3156 {
my %args = (
Entity => undef,
Encrypt => 1,
@@ -65,12 +96,15 @@
}
my $gnupg = new GnuPG::Interface;
- my %opt = RT->Config->Get('GnuPG');
+ my %opt = RT->Config->Get('GnuPGOptions');
$opt{'digest-algo'} ||= 'SHA1';
+ # address of the queue
+ my $sign_as = (Mail::Address->parse( $entity->head->get( 'From' ) ))[0]->address;
$gnupg->options->hash_init(
_PrepareGnuPGOptions( %opt ),
armor => 1,
meta_interactive => 0,
+ default_key => $sign_as,
);
my %res;
@@ -89,16 +123,13 @@
$gnupg->passphrase( $args{'Passphrase'} );
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG', 'LC_ALL'} = ('C', 'C');
-
- my $pid = $gnupg->detach_sign( handles => $handles );
+ my $pid = _safe_run_child { $gnupg->detach_sign( handles => $handles ) };
$entity->make_multipart( 'mixed', Force => 1 );
$entity->parts(0)->print( $handle{'input'} );
close $handle{'input'};
waitpid $pid, 0;
};
-
+ my $err = $@;
my @signature = readline $handle{'output'};
close $handle{'output'};
@@ -111,8 +142,8 @@
$RT::Logger->debug( $res{'status'} ) if $res{'status'};
$RT::Logger->warning( $res{'error'} ) if $res{'error'};
$RT::Logger->error( $res{'logger'} ) if $res{'logger'} && $?;
- if ( $@ || $? ) {
- $res{'message'} = $@? $@: "gpg exitted with error code ". ($? >> 8);
+ if ( $err || $res{'exit_code'} ) {
+ $res{'message'} = $err? $err : "gpg exitted with error code ". ($res{'exit_code'} >> 8);
return %res;
}
@@ -150,12 +181,9 @@
$gnupg->passphrase( $args{'Passphrase'} ) if $args{'Sign'};
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG', 'LC_ALL'} = ('C', 'C');
-
- my $pid = $args{'Sign'}?
- $gnupg->sign_and_encrypt( handles => $handles ):
- $gnupg->encrypt( handles => $handles );
+ my $pid = _safe_run_child { $args{'Sign'}
+ ? $gnupg->sign_and_encrypt( handles => $handles )
+ : $gnupg->encrypt( handles => $handles ) };
$entity->make_multipart( 'mixed', Force => 1 );
$entity->parts(0)->print( $handle{'input'} );
close $handle{'input'};
@@ -287,6 +315,22 @@
};
}
+ # attachments with inline encryption
+ my @encrypted_files =
+ grep $_->head->recommended_filename
+ && $_->head->recommended_filename =~ /\.pgp$/,
+ $entity->parts;
+
+ foreach my $part ( @encrypted_files ) {
+ $skip{"$part"}++;
+ push @res, {
+ Type => 'encrypted',
+ Format => 'Attachment',
+ Top => $entity,
+ Data => $part,
+ };
+ }
+
push @res, FindProtectedParts( Entity => $_ )
foreach grep !$skip{"$_"}, $entity->parts;
@@ -323,9 +367,9 @@
if ( $item->{'Format'} eq 'RFC3156' ) {
push @res, { DecryptRFC3156( %$item ) };
} elsif ( $item->{'Format'} eq 'Inline' ) {
-# push @res, { DecryptInline( %$item ) };
+ push @res, { DecryptInline( %$item ) };
} elsif ( $item->{'Format'} eq 'Attachment' ) {
-# push @res, { DecryptAttachment( %$item ) };
+ push @res, { DecryptAttachment( %$item ) };
# if ( $args{'Detach'} ) {
# $item->{'Top'}->parts( [ grep "$_" ne $item->{'Signature'}, $item->{'Top'}->parts ] );
# $item->{'Top'}->make_singlepart;
@@ -339,7 +383,7 @@
my %args = ( Data => undef, Top => undef, @_ );
my $gnupg = new GnuPG::Interface;
- my %opt = RT->Config->Get('GnuPG');
+ my %opt = RT->Config->Get('GnuPGOptions');
$opt{'digest-algo'} ||= 'SHA1';
$gnupg->options->hash_init(
_PrepareGnuPGOptions( %opt ),
@@ -357,10 +401,7 @@
my %res;
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG','LC_ALL'} = ('C', 'C');
-
- my $pid = $gnupg->verify( handles => $handles );
+ my $pid = _safe_run_child { $gnupg->verify( handles => $handles ) };
$args{'Data'}->bodyhandle->print( $handle{'input'} );
close $handle{'input'};
@@ -385,7 +426,7 @@
my %args = ( Data => undef, Signature => undef, Top => undef, @_ );
my $gnupg = new GnuPG::Interface;
- my %opt = RT->Config->Get('GnuPG');
+ my %opt = RT->Config->Get('GnuPGOptions');
$opt{'digest-algo'} ||= 'SHA1';
$gnupg->options->hash_init(
_PrepareGnuPGOptions( %opt ),
@@ -408,10 +449,7 @@
my %res;
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG','LC_ALL'} = ('C', 'C');
-
- my $pid = $gnupg->verify( handles => $handles, command_args => [ '-', $tmp_fn ] );
+ my $pid = _safe_run_child { $gnupg->verify( handles => $handles, command_args => [ '-', $tmp_fn ] ) };
$args{'Signature'}->bodyhandle->print( $handle{'input'} );
close $handle{'input'};
@@ -436,7 +474,7 @@
my %args = ( Data => undef, Signature => undef, Top => undef, @_ );
my $gnupg = new GnuPG::Interface;
- my %opt = RT->Config->Get('GnuPG');
+ my %opt = RT->Config->Get('GnuPGOptions');
$opt{'digest-algo'} ||= 'SHA1';
$gnupg->options->hash_init(
_PrepareGnuPGOptions( %opt ),
@@ -459,10 +497,7 @@
my %res;
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG','LC_ALL'} = ('C', 'C');
-
- my $pid = $gnupg->verify( handles => $handles, command_args => [ '-', $tmp_fn ] );
+ my $pid = _safe_run_child { $gnupg->verify( handles => $handles, command_args => [ '-', $tmp_fn ] ) };
$args{'Signature'}->bodyhandle->print( $handle{'input'} );
close $handle{'input'};
@@ -493,7 +528,7 @@
);
my $gnupg = new GnuPG::Interface;
- my %opt = RT->Config->Get('GnuPG');
+ my %opt = RT->Config->Get('GnuPGOptions');
$opt{'digest-algo'} ||= 'SHA1';
$gnupg->options->hash_init(
_PrepareGnuPGOptions( %opt ),
@@ -518,11 +553,8 @@
my %res;
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG','LC_ALL'} = ('C', 'C');
-
$gnupg->passphrase( $args{'Passphrase'} );
- my $pid = $gnupg->decrypt( handles => $handles );
+ my $pid = _safe_run_child { $gnupg->decrypt( handles => $handles ) };
$args{'Data'}->bodyhandle->print( $handle{'input'} );
close $handle{'input'};
@@ -539,49 +571,175 @@
$RT::Logger->error( $res{'logger'} ) if $res{'logger'} && $?;
if ( $@ || $? ) {
$res{'message'} = $@? $@: "gpg exitted with error code ". ($? >> 8);
- return (undef, \%res);
+ return %res;
}
seek $tmp_fh, 0, 0;
my $parser = new MIME::Parser;
- RT::EmailParser->_SetupMIMEParser( $parser );
+ my $rt_parser = new RT::EmailParser;
+ $rt_parser->_SetupMIMEParser( $parser );
my $decrypted = $parser->parse( $tmp_fh );
+ $decrypted->{'__store_link_to_object_to_avoid_early_cleanup'} = $rt_parser;
$args{'Top'}->parts( [] );
$args{'Top'}->add_part( $decrypted );
$args{'Top'}->make_singlepart;
return %res;
}
+sub DecryptInline {
+ my %args = (
+ Data => undef,
+ Passphrase => undef,
+ @_
+ );
+
+ my $gnupg = new GnuPG::Interface;
+ my %opt = RT->Config->Get('GnuPGOptions');
+ $opt{'digest-algo'} ||= 'SHA1';
+ $gnupg->options->hash_init(
+ _PrepareGnuPGOptions( %opt ),
+ meta_interactive => 0,
+ );
+
+ $args{'Passphrase'} = GetPassphrase()
+ unless defined $args{'Passphrase'};
+
+ my ($tmp_fh, $tmp_fn) = File::Temp::tempfile();
+ binmode $tmp_fh, ':raw';
+
+ my %handle;
+ my $handles = GnuPG::Handles->new(
+ stdin => ($handle{'input'} = new IO::Handle),
+ stdout => $tmp_fh,
+ stderr => ($handle{'error'} = new IO::Handle),
+ logger => ($handle{'logger'} = new IO::Handle),
+ status => ($handle{'status'} = new IO::Handle),
+ );
+ $handles->options( 'stdout' )->{'direct'} = 1;
+
+ my %res;
+ eval {
+ $gnupg->passphrase( $args{'Passphrase'} );
+ my $pid = _safe_run_child { $gnupg->decrypt( handles => $handles ) };
+ $args{'Data'}->bodyhandle->print( $handle{'input'} );
+ close $handle{'input'};
+
+ waitpid $pid, 0;
+ };
+ $res{'exit_code'} = $?;
+ foreach ( qw(error logger status) ) {
+ $res{$_} = do { local $/; readline $handle{$_} };
+ delete $res{$_} unless $res{$_} && $res{$_} =~ /\S/s;
+ close $handle{$_};
+ }
+ $RT::Logger->debug( $res{'status'} ) if $res{'status'};
+ $RT::Logger->warning( $res{'error'} ) if $res{'error'};
+ $RT::Logger->error( $res{'logger'} ) if $res{'logger'} && $?;
+ if ( $@ || $? ) {
+ $res{'message'} = $@? $@: "gpg exitted with error code ". ($? >> 8);
+ return %res;
+ }
+
+ seek $tmp_fh, 0, 0;
+ $args{'Data'}->bodyhandle( new MIME::Body::File $tmp_fn );
+ $args{'Data'}->{'__store_tmp_handle_to_avoid_early_cleanup'} = $tmp_fh;
+ return %res;
+}
+
+sub DecryptAttachment {
+ my %args = (
+ Top => undef,
+ Data => undef,
+ Passphrase => undef,
+ @_
+ );
+ my %res = DecryptInline( %args );
+ return %res if $res{'exit_code'};
+
+ my $filename = $args{'Data'}->head->recommended_filename;
+ $filename =~ s/\.pgp$//i;
+ $args{'Data'}->head->mime_attr( $_ => $filename )
+ foreach (qw(Content-Type.name Content-Disposition.filename));
+
+ return %res;
+}
+
sub GetPassphrase {
- return undef;
+ return 'passphrase';
}
-my %inv_recp_reason = (
- 0 => "No specific reason given",
- 1 => "Not Found",
- 2 => "Ambigious specification",
- 3 => "Wrong key usage",
- 4 => "Key revoked",
- 5 => "Key expired",
- 6 => "No CRL known",
- 7 => "CRL too old",
- 8 => "Policy mismatch",
- 9 => "Not a secret key",
- 10 => "Key not trusted",
-);
+=head2 ParseStatus
+
+Takes a string containing output of gnupg status stream. Parses it and returns
+array of hashes. Each element of array is a hash ref and represents line or
+group of lines in the status message.
+
+All hashes have Operation, Status and Message elements.
+
+=over
+
+=item Operation
+
+Classification of operations gnupg perfoms. Now we have suppoort
+for Sign, Encrypt, Decrypt, Verify, PassphraseCheck, RecipientsCheck and Data
+values.
+
+=item Status
+
+Informs about success. Value is 'DONE' on success, other values means that
+an operation failed, for example 'ERROR', 'BAD', 'MISSING' and may be other.
+
+=item Message
+
+User friendly message.
-my %nodata_what = (
- 1 => "No armored data",
- 2 => "Expected a packet, but did not found one",
- 3 => "Invalid packet found",
- 4 => "Signature expected, but not found",
+=back
+
+This parser is based on information from GnuPG distribution, see also
+F<docs/design_docs/gnupg_details_on_output_formats> in the RT distribution.
+
+=cut
+
+my %REASON_CODE_TO_TEXT = (
+ NODATA => {
+ 1 => "No armored data",
+ 2 => "Expected a packet, but did not found one",
+ 3 => "Invalid packet found",
+ 4 => "Signature expected, but not found",
+ },
+ INV_RECP => {
+ 0 => "No specific reason given",
+ 1 => "Not Found",
+ 2 => "Ambigious specification",
+ 3 => "Wrong key usage",
+ 4 => "Key revoked",
+ 5 => "Key expired",
+ 6 => "No CRL known",
+ 7 => "CRL too old",
+ 8 => "Policy mismatch",
+ 9 => "Not a secret key",
+ 10 => "Key not trusted",
+ },
+ ERRSIG => {
+ 0 => 'not specified',
+ 4 => 'unknown algorithm',
+ 9 => 'missing public key',
+ },
);
+sub ReasonCodeToText {
+ my $keyword = shift;
+ my $code = shift;
+ return $REASON_CODE_TO_TEXT{ $keyword }{ $code }
+ if exists $REASON_CODE_TO_TEXT{ $keyword }{ $code };
+ return 'unknown';
+}
+
my %simple_keyword = (
NO_RECP => {
Operation => 'RecipientsCheck',
Status => 'ERROR',
- Message => 'No recipients are usable',
+ Message => 'No recipients',
},
UNEXPECTED => {
Operation => 'Data',
@@ -595,18 +753,24 @@
},
);
+# keywords we parse
my %parse_keyword = map { $_ => 1 } qw(
USERID_HINT
SIG_CREATED GOODSIG
END_ENCRYPTION
+ DECRYPTION_FAILED DECRYPTION_OKAY
BAD_PASSPHRASE GOOD_PASSPHRASE
ENC_TO
+ NO_SECKEY NO_PUBKEY
NO_RECP INV_RECP NODATA UNEXPECTED
);
+# keywords we ignore without any messages as we parse them using other
+# keywords as starting point or just ignore as they are useless for us
my %ignore_keyword = map { $_ => 1 } qw(
NEED_PASSPHRASE MISSING_PASSPHRASE BEGIN_SIGNING PLAINTEXT PLAINTEXT_LENGTH
BEGIN_ENCRYPTION SIG_ID VALIDSIG
+ BEGIN_DECRYPTION END_DECRYPTION GOODMDC
TRUST_UNDEFINED TRUST_NEVER TRUST_MARGINAL TRUST_FULLY TRUST_ULTIMATE
);
@@ -623,11 +787,12 @@
my @res;
my (%user_hint, $latest_user_main_key);
- for( my $i = 0; $i < @status; $i++ ) {
+ for ( my $i = 0; $i < @status; $i++ ) {
my $line = $status[$i];
my ($keyword, $args) = ($line =~ /^(\S+)\s*(.*)$/s);
if ( $simple_keyword{ $keyword } ) {
push @res, $simple_keyword{ $keyword };
+ $res[-1]->{'Keyword'} = $keyword;
next;
}
unless ( $parse_keyword{ $keyword } ) {
@@ -650,7 +815,6 @@
my $key_id = $args;
my %res = (
Operation => 'PassphraseCheck',
- Keyword => $keyword,
Status => $keyword eq 'BAD_PASSPHRASE'? 'BAD' : 'DONE',
Key => $key_id,
);
@@ -661,12 +825,12 @@
@res{'MainKey', 'Key', 'KeyType'} = ($1, $2, $3);
last;
}
- $res{'Message'} = ucfirst( lc $res{'Status'} ) .' passphrase';
+ $res{'Message'} = ucfirst( lc( $res{'Status'} eq 'DONE'? 'GOOD': $res{'Status'} ) ) .' passphrase';
$res{'User'} = ( $user_hint{ $res{'MainKey'} } ||= {} ) if $res{'MainKey'};
if ( exists $res{'User'}->{'EmailAddress'} ) {
- $res{'Message'} .= ' for address '. $res{'User'}->{'EmailAddress'};
+ $res{'Message'} .= ' for '. $res{'User'}->{'EmailAddress'};
} else {
- $res{'Message'} .= ' for key '. $key_id;
+ $res{'Message'} .= " for '0x$key_id'";
}
push @res, \%res;
}
@@ -674,6 +838,7 @@
my %res = (
Operation => 'Encrypt',
Status => 'DONE',
+ Message => 'Data has been encrypted',
);
foreach my $line ( reverse @status[ 0 .. $i-1 ] ) {
next unless $line =~ /^BEGIN_ENCRYPTION\s+(\S+)\s+(\S+)/;
@@ -682,16 +847,45 @@
}
push @res, \%res;
}
+ elsif ( $keyword eq 'DECRYPTION_FAILED' ) {
+ my %res = (
+ Operation => 'Decrypt',
+ Status => 'ERROR',
+ Message => 'Decryption failed',
+ );
+ push @res, \%res;
+ }
+ elsif ( $keyword eq 'DECRYPTION_OKAY' ) {
+ my %res = (
+ Operation => 'Decrypt',
+ Status => 'DONE',
+ Message => 'Decryption process succeeded',
+ );
+ push @res, \%res;
+ }
elsif ( $keyword eq 'ENC_TO' ) {
- my ($main_key_id, $alg_id) = split /\s+/, $args;
+ my ($key, $alg, $key_length) = split /\s+/, $args;
+ my %res = (
+ Operation => 'Decrypt',
+ Status => 'DONE',
+ Message => "The message is encrypted to '0x$key'",
+ Key => $key,
+ KeyLength => $key_length,
+ Algorithm => $alg,
+ );
+ $res{'User'} = ( $user_hint{ $key } ||= {} );
+ push @res, \%res;
+ }
+ elsif ( $keyword eq 'NO_SECKEY' || $keyword eq 'NO_PUBKEY' ) {
+ my ($key) = split /\s+/, $args;
+ my $type = $keyword eq 'NO_SECKEY'? 'secret': 'public';
my %res = (
- Keyword => 'ENC_TO',
- Operation => 'Encoded',
- MainKey => $main_key_id,
- Algorithm => $alg_id,
+ Operation => 'KeyCheck',
+ Status => 'MISSING',
+ Message => ucfirst( $type ) ." key '0x$key' is not available",
+ Key => $key,
);
- $user_hint{ $main_key_id } ||= {};
- $res{'User'} = $user_hint{ $main_key_id };
+ $res{'User'} = ( $user_hint{ $key } ||= {} );
push @res, \%res;
}
# GOODSIG, BADSIG, VALIDSIG, TRUST_*
@@ -702,11 +896,15 @@
Message => 'The signature is good',
);
@res{qw(Key UserString)} = split /\s+/, $args, 2;
+ $res{'Message'} .= ', signed by '. $res{'UserString'};
+
foreach my $line ( @status[ $i .. $#status ] ) {
next unless $line =~ /^TRUST_(\S+)/;
- $res{'Trust'} = ($1);
+ $res{'Trust'} = $1;
last;
}
+ $res{'Message'} .= ', trust level is '. lc( $res{'Trust'} || 'unknown');
+
foreach my $line ( @status[ $i .. $#status ] ) {
next unless $line =~ /^VALIDSIG\s+(.*)/;
@res{ qw(
@@ -738,14 +936,15 @@
elsif ( $keyword eq 'ERRSIG' ) {
my %res = (
Operation => 'Verify',
- Message => 'Not possible to check the signature',
Status => 'ERROR',
+ Message => 'Not possible to check the signature',
);
@res{qw(Key PubkeyAlgo HashAlgo Class Timestamp ReasonCode Other)}
= split /\s+/, $args, 7;
- my %rc = ( 4 => 'unknown algorithm', 9 => 'missing public key' );
- $res{'Reason'} = $rc{ $res{'ReasonCode'} } || 'not specified';
- $res{'Message'} .= ", the reasion is ". $res{'ReasonCode'};
+
+ $res{'Reason'} = ReasonCodeToText( $keyword, $res{'ReasonCode'} );
+ $res{'Message'} .= ", the reasion is ". $res{'Reason'};
+
push @res, \%res;
}
elsif ( $keyword eq 'SIG_CREATED' ) {
@@ -768,24 +967,31 @@
}
elsif ( $keyword eq 'INV_RECP' ) {
my ($rcode, $recipient) = split /\s+/, $args, 2;
- my $reason = $inv_recp_reason{$rcode} || 'Unknown';
+ my $reason = ReasonCodeToText( $keyword, $rcode );
push @res, {
- Operation => 'RecipientsCheck',
- Keyword => 'INV_RECP',
- Message => "Recipient '$recipient' is unusable, the reason is '$reason'",
- RequestedRecipient => $recipient,
- Reason => $reason,
+ Operation => 'RecipientsCheck',
+ Status => 'ERROR',
+ Message => "Recipient '$recipient' is unusable, the reason is '$reason'",
+ Recipient => $recipient,
+ ReasonCode => $rcode,
+ Reason => $reason,
};
}
elsif ( $keyword eq 'NODATA' ) {
- my $what = $nodata_what{ (split /\s+/, $args)[0] } || 'Unknown';
+ my $rcode = (split /\s+/, $args)[0];
+ my $reason = ReasonCodeToText( $keyword, $rcode );
push @res, {
- Operation => 'Data',
- Keyword => 'NODATA',
- Message => "No data has been found. The reason is '$what'",
- What => $what,
+ Operation => 'Data',
+ Message => "No data has been found. The reason is '$reason'",
+ ReasonCode => $rcode,
+ Reason => $reason,
};
}
+ else {
+ $RT::Logger->warning("Keyword $keyword is unknown");
+ next;
+ }
+ $res[-1]{'Keyword'} = $keyword unless $res[-1]{'Keyword'};
}
return @res;
}
@@ -826,7 +1032,7 @@
my $type = shift || 'public';
my $gnupg = new GnuPG::Interface;
- my %opt = RT->Config->Get('GnuPG');
+ my %opt = RT->Config->Get('GnuPGOptions');
$opt{'digest-algo'} ||= 'SHA1';
$opt{'with-colons'} = undef; # parseable format
$opt{'fixed-list-mode'} = undef; # don't merge uid with keys
@@ -847,16 +1053,12 @@
);
eval {
- local $SIG{'CHLD'} = 'DEFAULT';
- local @ENV{'LANG', 'LC_ALL'} = ('C', 'C');
my $method = $type eq 'private'? 'list_secret_keys': 'list_public_keys';
- my $pid = $gnupg->$method( handles => $handles, command_args => [ $email ] );
+ my $pid = _safe_run_child { $gnupg->$method( handles => $handles, command_args => [ $email ] ) };
waitpid $pid, 0;
};
my @info = readline $handle{'output'};
- use Data::Dumper; $RT::Logger->error( Dumper(\@info) );
-
close $handle{'output'};
$res{'exit_code'} = $?;
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email.pm Fri Apr 20 13:49:12 2007
@@ -273,7 +273,7 @@
To => $args{'To'},
Subject => $args{'Subject'},
Precedence => 'bulk',
- 'X-RT-Loop-Prevention' => scalar RT->Config->Get('rtname'),
+ 'X-RT-Loop-Prevention' => RT->Config->Get('rtname'),
'In-Reply-To:' => $args{'MIMEObj'} ? $args{'MIMEObj'}->head->get('Message-Id') : undef,
);
@@ -330,17 +330,20 @@
$args{'Ticket'} = $args{'Transaction'}->Object;
}
- if ( $args{'Ticket'} ) {
- my $sign = $args{'Ticket'}->QueueObj->Sign;
- my $encrypt = $args{'Ticket'}->QueueObj->Encrypt;
- if ( $sign || $encrypt ) {
- require RT::Crypt::GnuPG;
- my %res = RT::Crypt::GnuPG::SignEncrypt(
- Entity => $args{'Entity'},
- Sign => $sign, Encrypt => $encrypt,
- );
- return 0 if $res{'exit_code'};
+ if ( $args{'Ticket'} && $args{'Transaction'} ) {
+ my $attachment = $args{'Transaction'}->Attachments->First;
+
+ my %crypt;
+ foreach my $argument ( qw(Sign Encrypt) ) {
+ if ( $attachment && defined $attachment->GetHeader("X-RT-$argument") ) {
+ $crypt{$argument} = $attachment->GetHeader("X-RT-$argument");
+ } else {
+ $crypt{$argument} = $args{'Ticket'}->QueueObj->$argument();
+ }
}
+
+ my $res = SignEncrypt( %args, %crypt );
+ return $res unless $res > 0;
}
my $msgid = $args{'Entity'}->head->get('Message-ID') || '';
@@ -420,6 +423,46 @@
return 1;
}
+=head2 SendEmailUsingTemplate Template => '', Arguments => {}, To => '', Cc => '', Bcc => ''
+
+Sends email using a template, takes name of template, arguments for it and recipients.
+
+=cut
+
+sub SendEmailUsingTemplate {
+ my %args = (
+ Template => '',
+ Arguments => {},
+ To => undef,
+ Cc => undef,
+ Bcc => undef,
+ @_
+ );
+
+ my $template = RT::Template->new( $RT::SystemUser );
+ $template->LoadGlobalTemplate( $args{'Template'} );
+ unless ( $template->id ) {
+ $RT::Logger->error("Couldn't load template '". $args{'Template'} ."'");
+ return 0;
+ }
+ $template->Parse( %{ $args{'Arguments'} } );
+
+ my $msg = $template->MIMEObj;
+ # template parsing error
+ return 0 unless $msg;
+
+ $msg->head->set( $_ => $args{ $_ } )
+ foreach grep defined $args{$_}, qw(To Cc Bcc);
+
+ return SendEmail( Entity => $msg );
+}
+
+=head2 ForwardTransaction TRANSACTION, To => '', Cc => '', Bcc => ''
+
+Forwards transaction with all attachments 'message/rfc822'.
+
+=cut
+
sub ForwardTransaction {
my $txn = shift;
my %args = ( To => '', Cc => '', Bcc => '', @_ );
@@ -480,6 +523,108 @@
return (1, $txn->loc("Send email successfully"));
}
+=head2 SignEncrypt Entity => undef, Sign => 0, Encrypt => 0
+
+Signs and encrypts message using L<RT::Crypt::GnuPG>, but as well
+handle errors with users' keys.
+
+If a recipient has no key or has other problems with it, then the
+unction sends a error to him using 'Error: public key' template.
+Also, notifies RT's owner using template 'Error to RT owner: public key'
+to inform that there are problems with users' keys. Then we filter
+all bad recipients and retry.
+
+Returns 1 on success, 0 on error and -1 if all recipients are bad and
+had been filtered out.
+
+=cut
+
+sub SignEncrypt {
+ my %args = (
+ Entity => undef,
+ Sign => 0,
+ Encrypt => 0,
+ @_
+ );
+ return 1 unless $args{'Sign'} || $args{'Ecrypt'};
+
+ $RT::Logger->debug('Signing message') if $args{'Sign'};
+ $RT::Logger->debug('Encrypting message') if $args{'Ecrypt'};
+
+ require RT::Crypt::GnuPG;
+ my %res = RT::Crypt::GnuPG::SignEncrypt(
+ Entity => $args{'Entity'},
+ Sign => $args{'Sign'},
+ Encrypt => $args{'Encrypt'},
+ );
+ return 1 unless $res{'exit_code'};
+
+ my @status = RT::Crypt::GnuPG::ParseStatus( $res{'status'} );
+
+ my @bad_recipients;
+ foreach my $line ( @status ) {
+ next unless ($line->{'Operation'}||'') eq 'RecipientsCheck';
+ next if $line->{'Status'} eq 'DONE';
+ $RT::Logger->error( $line->{'Message'} );
+ push @bad_recipients, $line;
+ }
+ return 0 unless @bad_recipients;
+
+ $_->{'AddressObj'} = (Mail::Address->parse( $_->{'Recipient'} ))[0]
+ foreach @bad_recipients;
+
+ foreach my $recipient ( @bad_recipients ) {
+ my $status = SendEmailUsingTemplate(
+ To => $recipient->{'AddressObj'}->address,
+ Template => 'Error: public key',
+ Arguments => {
+ %$recipient,
+ TicketObj => $args{'Ticket'},
+ TransactionObj => $args{'Transaction'},
+ },
+ );
+ unless ( $status ) {
+ $RT::Logger->error("Couldn't send 'Error: public key'");
+ }
+ }
+
+ my $status = SendEmailUsingTemplate(
+ To => RT->Config->Get('OwnerEmail'),
+ Template => 'Error to RT owner: public key',
+ Arguments => {
+ BadRecipients => \@bad_recipients,
+ TicketObj => $args{'Ticket'},
+ TransactionObj => $args{'Transaction'},
+ },
+ );
+ unless ( $status ) {
+ $RT::Logger->error("Couldn't send 'Error to RT owner: public key'");
+ }
+
+ DeleteRecipientsFromHead(
+ $args{'Entity'}->head,
+ map $_->{'AddressObj'}->address, @bad_recipients
+ );
+
+ unless ( $args{'Entity'}->head->get('To')
+ || $args{'Entity'}->head->get('Cc')
+ || $args{'Entity'}->head->get('Bcc') )
+ {
+ return -1;
+ }
+
+ # redo without broken recipients
+ %res = RT::Crypt::GnuPG::SignEncrypt(
+ Entity => $args{'Entity'},
+ Sign => $args{'Sign'},
+ Encrypt => $args{'Encrypt'},
+ );
+ return 0 if $res{'exit_code'};
+
+ return 1;
+}
+
+
sub CreateUser {
my ( $Username, $Address, $Name, $ErrorsTo, $entity ) = @_;
@@ -497,7 +642,6 @@
unless ($Val) {
# Deal with the race condition of two account creations at once
- #
if ($Username) {
$NewUser->LoadByName($Username);
}
@@ -557,23 +701,22 @@
@_
);
- my (@Addresses);
+ my @recipients =
+ map lc $_->address,
+ map Mail::Address->parse( $args{'Head'}->get( $_ ) ),
+ qw(To Cc);
+
+ my @res;
+ foreach my $address ( @recipients ) {
+ $address = $args{'CurrentUser'}->UserObj->CanonicalizeEmailAddress( $address );
+ next if lc $args{'CurrentUser'}->EmailAddress eq $address;
+ next if lc $args{'QueueObj'}->CorrespondAddress eq $address;
+ next if lc $args{'QueueObj'}->CommentAddress eq $address;
+ next if IsRTAddress( $address );
- my @ToObjs = Mail::Address->parse( $args{'Head'}->get('To') );
- my @CcObjs = Mail::Address->parse( $args{'Head'}->get('Cc') );
-
- foreach my $AddrObj ( @ToObjs, @CcObjs ) {
- my $Address = $AddrObj->address;
- $Address = $args{'CurrentUser'}
- ->UserObj->CanonicalizeEmailAddress($Address);
- next if ( $args{'CurrentUser'}->EmailAddress =~ /^\Q$Address\E$/i );
- next if ( $args{'QueueObj'}->CorrespondAddress =~ /^\Q$Address\E$/i );
- next if ( $args{'QueueObj'}->CommentAddress =~ /^\Q$Address\E$/i );
- next if ( RT::EmailParser->IsRTAddress($Address) );
-
- push( @Addresses, $Address );
+ push @res, $address;
}
- return (@Addresses);
+ return @res;
}
@@ -652,6 +795,25 @@
return ( $Address, $Name );
}
+=head2 DeleteRecipientsFromHead HEAD RECIPIENTS
+
+Gets a head object and list of addresses.
+Deletes addresses from To, Cc or Bcc fields.
+
+=cut
+
+sub DeleteRecipientsFromHead {
+ my $head = shift;
+ my %skip = map { lc $_ => 1 } @_;
+
+ foreach my $field ( qw(To Cc Bcc) ) {
+ $head->set( $field =>
+ join ', ', map $_->format, grep !$skip{ lc $_->address },
+ Mail::Address->parse( $head->get( $field ) )
+ );
+ }
+}
+
sub ParseTicketId {
@@ -1043,7 +1205,7 @@
# Notify the RT Admin of the failure.
MailError(
- To => scalar RT->Config->Get('OwnerEmail'),
+ To => RT->Config->Get('OwnerEmail'),
Subject => "Could not load a valid user",
Explanation => <<EOT,
RT could not load a valid user, and RT's configuration does not allow
Added: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/GnuPGNG.pm
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/GnuPGNG.pm Fri Apr 20 13:49:12 2007
@@ -0,0 +1,81 @@
+package RT::Interface::Email::Auth::GnuPGNG;
+
+use strict;
+use warnings;
+
+=head2 GetCurrentUser
+
+To use the gnupg-secured mail gateway, you need to do the following:
+
+Set up a gnupgp key directory with a pubring containing only the keys
+you care about and specify the following in your SiteConfig.pm
+
+Set(%GnuPG, homedir => '/opt/rt3/var/data/GnuPG');
+Set(@MailPlugins, 'Auth::GnuPGNG', ...other filter...);
+
+=cut
+
+use RT::Crypt::GnuPG;
+
+sub GetCurrentUser {
+ my %args = (
+ Message => undef,
+ RawMessageRef => undef,
+ CurrentUser => undef,
+ AuthLevel => undef,
+ Ticket => undef,
+ Queue => undef,
+ Action => undef,
+ @_
+ );
+
+ $args{'Message'}->head->delete('X-RT-GnuPG-Status');
+
+ my ($status, @res) = VerifyDecrypt( Entity => $args{'Message'} );
+ return @args{qw(CurrentUser AuthLevel)} if $status && !@res;
+
+ $RT::Logger->error("Had a problem during decrypting and verifying")
+ unless $status;
+
+ $args{'Message'}->head->add( 'X-RT-GnuPG-Status' => $_->{'status'} )
+ foreach @res;
+
+ return @args{qw(CurrentUser AuthLevel)};
+}
+
+sub VerifyDecrypt {
+ my %args = (
+ Entity => undef,
+ @_
+ );
+
+ my @res = RT::Crypt::GnuPG::VerifyDecrypt( %args );
+ unless ( @res ) {
+ $RT::Logger->debug("No more encrypted/signed parts");
+ return 1;
+ }
+
+ $RT::Logger->debug('Found GnuPG protected parts');
+
+ # return on any error
+ if ( grep $_->{'exit_code'}, @res ) {
+ $RT::Logger->debug("Error during verify/decrypt operation");
+ return (0, @res);
+ }
+
+ # nesting
+ my ($status, @nested) = VerifyDecrypt( %args );
+ return $status, @res, @nested;
+}
+
+eval "require RT::Interface::Email::Auth::GnuPGNG_Vendor";
+die $@
+ if ( $@
+ && $@ !~ qr{^Can't locate RT/Interface/Email/Auth/GnuPGNG_Vendor.pm} );
+eval "require RT::Interface::Email::Auth::GnuPGNG_Local";
+die $@
+ if ( $@
+ && $@ !~ qr{^Can't locate RT/Interface/Email/Auth/GnuPGNG_Local.pm} );
+
+1;
+
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/MailFrom.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/MailFrom.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Email/Auth/MailFrom.pm Fri Apr 20 13:49:12 2007
@@ -61,13 +61,17 @@
# We don't need to do any external lookups
my ( $Address, $Name ) = ParseSenderAddressFromHead( $args{'Message'}->head );
unless ( $Address ) {
+ $RT::Logger->error("Couldn't find sender's address");
return ( $args{'CurrentUser'}, -1 );
}
my $CurrentUser = new RT::CurrentUser;
$CurrentUser->LoadByEmail( $Address );
$CurrentUser->LoadByName( $Address ) unless $CurrentUser->Id;
- return ( $CurrentUser, 1 ) if $CurrentUser->Id;
+ if ( $CurrentUser->Id ) {
+ $RT::Logger->error("Mail from user #". $CurrentUser->Id ." ($Address)" );
+ return ( $CurrentUser, 1 );
+ }
# If the user can't be loaded, we may need to create one. Figure out the acl situation.
my $unpriv = RT::Group->new( $RT::SystemUser );
@@ -84,6 +88,8 @@
return ( $args{'CurrentUser'}, -1 );
}
+ $RT::Logger->debug("Going to create user with address '$Address'" );
+
# but before we do that, we need to make sure that the created user would have the right
# to do what we're doing.
if ( $args{'Ticket'} && $args{'Ticket'}->Id ) {
@@ -140,6 +146,7 @@
}
else {
+ $RT::Logger->warning("Action '". ($args{'Action'}||'') ."' is unknown");
return ( $args{'CurrentUser'}, 0 );
}
}
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web.pm Fri Apr 20 13:49:12 2007
@@ -598,25 +598,45 @@
);
}
- ## TODO: Implement public comments
- if ( $args{ARGSRef}->{'UpdateType'} =~ /^(private|public)$/ ) {
- my ( $Transaction, $Description, $Object ) = $args{TicketObj}->Comment(
- CcMessageTo => $args{ARGSRef}->{'UpdateCc'},
- BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+ my $bcc = $args{ARGSRef}->{'UpdateBcc'};
+ my $cc = $args{ARGSRef}->{'UpdateCc'};
+
+ my %message_args = (
+ CcMessageTo => $cc,
+ BccMessageTo => $bcc,
+ Sign => $args{ARGSRef}->{'Sign'},
+ Encrypt => $args{ARGSRef}->{'Encrypt'},
MIMEObj => $Message,
- TimeTaken => $args{ARGSRef}->{'UpdateTimeWorked'}
- );
+ TimeTaken => $args{ARGSRef}->{'UpdateTimeWorked'});
+
+
+ unless ( $args{'ARGRef'}->{'UpdateIgnoreAddressCheckboxes'} =="1") {
+ foreach my $key ( keys %{ $args{ARGSRef} } ) {
+ if ( $key =~ /^Update(Cc|Bcc)-(.*)$/ ) {
+ my $var = ucfirst($1).'MessageTo';
+ my $value = $2;
+ {
+ if ( $args{$var} ) {
+ $message_args{$var} .= ", $value";
+ } else {
+ $message_args{$var} = $value;
+ }
+ }
+ }
+
+ }
+ }
+
+
+
+ if ( $args{ARGSRef}->{'UpdateType'} =~ /^(private|public)$/ ) {
+ my ( $Transaction, $Description, $Object ) = $args{TicketObj}->Comment(%message_args);
push( @results, $Description );
$Object->UpdateCustomFields( ARGSRef => $args{ARGSRef} ) if $Object;
}
elsif ( $args{ARGSRef}->{'UpdateType'} eq 'response' ) {
my ( $Transaction, $Description, $Object ) =
- $args{TicketObj}->Correspond(
- CcMessageTo => $args{ARGSRef}->{'UpdateCc'},
- BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
- MIMEObj => $Message,
- TimeTaken => $args{ARGSRef}->{'UpdateTimeWorked'}
- );
+ $args{TicketObj}->Correspond(%message_args);
push( @results, $Description );
$Object->UpdateCustomFields( ARGSRef => $args{ARGSRef} ) if $Object;
}
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web/Request.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web/Request.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Interface/Web/Request.pm Fri Apr 20 13:49:12 2007
@@ -60,8 +60,12 @@
sub callback {
my ($self, %args) = @_;
- my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;
my $name = delete $args{'CallbackName'} || 'Default';
+ my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;
+ unless ( $page ) {
+ $RT::Logger->error("Coulnd't get a page name for callbacks");
+ return;
+ }
my $CacheKey = "$page--$name";
return 1 if delete $args{'CallbackOnce'} && $called{ $CacheKey };
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Record.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Record.pm Fri Apr 20 13:49:12 2007
@@ -809,7 +809,7 @@
sub _DecodeLOB {
my $self = shift;
my $ContentType = shift;
- my $ContentEncoding = shift;
+ my $ContentEncoding = shift || 'none';
my $Content = shift;
if ( $ContentEncoding eq 'base64' ) {
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Template_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Template_Overlay.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Template_Overlay.pm Fri Apr 20 13:49:12 2007
@@ -345,14 +345,6 @@
@_
);
- no warnings 'redefine';
- local $T::Ticket = $args{'TicketObj'};
- local $T::Transaction = $args{'TransactionObj'};
- local $T::Argument = $args{'Argument'};
- local $T::Requestor = eval { $T::Ticket->Requestors->UserMembersObj->First->Name };
- local $T::rtname = RT->Config->Get('rtname');
- local *T::loc = sub { $T::Ticket->loc(@_) };
-
my $content = $self->Content;
unless ( defined $content ) {
return ( undef, $self->loc("Permissions denied") );
@@ -366,14 +358,34 @@
SOURCE => $content
);
+ $args{'Ticket'} = delete $args{'TicketObj'} if $args{'TicketObj'};
+ $args{'Transaction'} = delete $args{'TransactionObj'} if $args{'TransactionObj'};
+ foreach my $key ( keys %args ) {
+ next unless ref $args{ $key };
+ next if ref $args{ $key } =~ /^(ARRAY|HASH|SCALAR|CODE)$/;
+ my $val = $args{ $key };
+ $args{ $key } = \$val;
+ }
+
+ $args{'Requestor'} = eval { $args{'Ticket'}->Requestors->UserMembersObj->First->Name };
+ $args{'rtname'} = RT->Config->Get('rtname');
+ if ( $args{'Ticket'} ) {
+ $args{'loc'} = sub { $args{'Ticket'}->loc(@_) };
+ } else {
+ $args{'loc'} = sub { $self->loc(@_) };
+ }
+
my $is_broken = 0;
- my $retval = $template->fill_in( PACKAGE => 'T', BROKEN => sub {
- my (%args) = @_;
- $RT::Logger->error("Template parsing error: $args{error}")
- unless $args{error} =~ /^Died at /; # ignore intentional die()
- $is_broken++;
- return undef;
- } );
+ my $retval = $template->fill_in(
+ HASH => \%args,
+ BROKEN => sub {
+ my (%args) = @_;
+ $RT::Logger->error("Template parsing error: $args{error}")
+ unless $args{error} =~ /^Died at /; # ignore intentional die()
+ $is_broken++;
+ return undef;
+ },
+ );
return ( undef, $self->loc('Template parsing error') ) if $is_broken;
# MIME::Parser has problems dealing with high-bit utf8 data.
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Ticket_Overlay.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Ticket_Overlay.pm Fri Apr 20 13:49:12 2007
@@ -633,9 +633,9 @@
# {{{ Add a transaction for the create
my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
- Type => "Create",
- TimeTaken => $args{'TimeWorked'},
- MIMEObj => $args{'MIMEObj'}
+ Type => "Create",
+ TimeTaken => $args{'TimeWorked'},
+ MIMEObj => $args{'MIMEObj'},
);
if ( $self->Id && $Trans ) {
@@ -1738,6 +1738,44 @@
# }}}
+
+=head2 TransactionAddresses
+
+Returns a composite hashref of the results of L<RT::Transaction/Addresses> for all this ticket's Create, Comment or Correspond transactions.
+The keys are C<To>, C<Cc> and C<Bcc>. The values are lists of C<Mail::Address> objects.
+
+NOTE: For performance reasons, this method might want to skip transactions and go straight for attachments. But to make that work right, we're going to need to go and walk around the access control in Attachment.pm's sub _Value.
+
+=cut
+
+
+sub TransactionAddresses {
+ my $self = shift;
+ my $txns = $self->Transactions;
+
+ my %addresses = ();
+ foreach my $type (qw(Create Comment Correspond)) {
+ $txns->Limit(FIELD => 'Type', OPERATOR => '=', VALUE => $type , ENTRYAGGREGATOR => 'OR', CASESENSITIVE => 1);
+ }
+
+ while (my $txn = $txns->Next) {
+ my $txnaddrs = $txn->Addresses;
+ foreach my $addrlist ( values %$txnaddrs ) {
+ foreach my $addr (@$addrlist) {
+ # Skip addresses without a phrase (things that are just raw addresses) if we have a phrase
+ next if ($addresses{$addr->address} && $addresses{$addr->address}->phrase && not $addr->phrase);
+ $addresses{$addr->address} = $addr;
+ }
+ }
+ }
+
+ return \%addresses;
+
+}
+
+
+
+
# {{{ Routines dealing with queues
# {{{ sub ValidateQueue
@@ -2175,8 +2213,11 @@
my %args = (
CcMessageTo => undef,
BccMessageTo => undef,
+ Encrypt => undef,
+ Sign => undef,
MIMEObj => undef,
Content => undef,
+ NoteType => 'Correspond',
TimeTaken => 0,
CommitScrips => 1,
@_
@@ -2200,21 +2241,28 @@
# The "NotifyOtherRecipients" scripAction will look for RT-Send-Cc: and
# RT-Send-Bcc: headers
+ # XXX: 'CcMessageTo' is EmailAddress line, so most probably here is bug
+ # as CanonicalizeEmailAddress expect only one address at a time
$args{'MIMEObj'}->head->add(
'RT-Send-Cc' => RT::User->CanonicalizeEmailAddress( $args{'CcMessageTo'} )
) if defined $args{'CcMessageTo'};
- $args{'MIMEObj'}->head->add(
- 'RT-Send-Bcc' => RT::User->CanonicalizeEmailAddress( $args{'BccMessageTo'} )
- ) if defined $args{'BccMessageTo'};
+ foreach my $argument (qw(Encrypt Sign)) {
+ $args{'MIMEObj'}->head->add(
+ "X-RT-$argument" => $args{ $argument }
+ ) if defined $args{ $argument };
+ }
# XXX: This code is duplicated several times
# If this is from an external source, we need to come up with its
# internal Message-ID now, so all emails sent because of this
# message have a common Message-ID
my $org = RT->Config->Get('Organization');
- unless ($args{'MIMEObj'}->head->get('Message-ID')
- =~ /<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@\Q$org\E>/) {
+
+
+
+ my $msgid = $args{'MIMEObj'}->head->get('Message-ID');
+ unless (defined $msgid && $msgid =~ /<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@\Q$org\E>/) {
$args{'MIMEObj'}->head->set( 'RT-Message-ID',
"<rt-"
. $RT::VERSION . "-"
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Transaction_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Transaction_Overlay.pm (original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Transaction_Overlay.pm Fri Apr 20 13:49:12 2007
@@ -330,6 +330,26 @@
# }}}
+
+=head2 Addresses
+
+Returns a hashref of addresses related to this transaction. See L<RT::Attachment/Addresses> for details.
+
+=cut
+
+sub Addresses {
+ my $self = shift;
+
+ if (my $attach = $self->Attachments->First) {
+ return $attach->Addresses;
+ }
+ else {
+ return {};
+ }
+
+}
+
+
# {{{ ContentObj
=head2 ContentObj
Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/t/data/crypt-gnupg/random_seed
==============================================================================
Binary files. No diff available.
More information about the Rt-commit
mailing list