You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ja...@apache.org on 2017/05/14 05:50:48 UTC
svn commit: r1795088 - in /subversion/branches/1.9.x-r1794166: ./
subversion/libsvn_subr/gpg_agent.c
Author: jamessan
Date: Sun May 14 05:50:47 2017
New Revision: 1795088
URL: http://svn.apache.org/viewvc?rev=1795088&view=rev
Log:
On the 1.9.x-r1794166 branch:
Merge r1795087 from trunk and resolve a minor text conflict.
Modified:
subversion/branches/1.9.x-r1794166/ (props changed)
subversion/branches/1.9.x-r1794166/subversion/libsvn_subr/gpg_agent.c
Propchange: subversion/branches/1.9.x-r1794166/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 14 05:50:47 2017
@@ -103,4 +103,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,1669945,167
0139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,
1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-17063
24,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759117-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,1769152,17
69456,1769973,1770677,1774109,1779948,1781507,1781655,1794166
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,1669945,167
0139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,
1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-17063
24,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759117-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,1769152,17
69456,1769973,1770677,1774109,1779948,1781507,1781655,1794166,1795087
Modified: subversion/branches/1.9.x-r1794166/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1794166/subversion/libsvn_subr/gpg_agent.c?rev=1795088&r1=1795087&r2=1795088&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1794166/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/branches/1.9.x-r1794166/subversion/libsvn_subr/gpg_agent.c Sun May 14 05:50:47 2017
@@ -64,9 +64,9 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include <apr_file_io.h>
#include <apr_pools.h>
#include <apr_strings.h>
+#include <apr_user.h>
#include "svn_auth.h"
#include "svn_config.h"
#include "svn_error.h"
@@ -228,63 +228,96 @@ bye_gpg_agent(int sd)
close(sd);
}
-/* Find gpg-agent socket location using gpgconf. Returns the path to socket, or
- * NULL if the socket path cannot be determined using gpgconf.
- */
+/* This implements a method of finding the socket which is a mix of the
+ * description from GPG 1.x's gpg-agent man page under the
+ * --use-standard-socket option and the logic from GPG 2.x's socket discovery
+ * code in common/homedir.c.
+ *
+ * The man page says the standard socket is "named 'S.gpg-agent' located
+ * in the home directory." GPG's home directory is either the directory
+ * specified by $GNUPGHOME or ~/.gnupg. GPG >= 2.1.13 will check for a
+ * socket under (/var)/run/UID/gnupg before ~/.gnupg if no environment
+ * variables are set.
+ *
+ * $GPG_AGENT_INFO takes precedence, if set, otherwise $GNUPGHOME will be
+ * used. For GPG >= 2.1.13, $GNUPGHOME will be used directly only if it
+ * refers to the canonical home -- ~/.gnupg. Otherwise, the path specified
+ * by $GNUPGHOME is hashed (SHA1 + z-base-32) and the socket is expected to
+ * be present under (/var)/run/UID/gnupg/d.HASH. This last mechanism is not
+ * yet supported here. */
static const char *
-find_gpgconf_agent_socket(apr_pool_t *pool)
+find_gpg_agent_socket(apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
- apr_proc_t proc;
- svn_stringbuf_t *line;
- svn_error_t *err;
- svn_boolean_t eof;
- const char* agent_socket;
- const char* const gpgargv[] = { "gpgconf", "--list-dir", NULL };
-
- /* execute "gpgconf --list-dir" */
- err = svn_io_start_cmd3(&proc, NULL, "gpgconf", gpgargv,
- NULL /* env */, TRUE /* inherit */,
- FALSE /* infile_pipe */, NULL /* infile */,
- TRUE /* outfile_pipe */, NULL /* outfile */,
- FALSE /* errfile_pipe */, NULL /* errfile */,
- pool);
- if (err != SVN_NO_ERROR)
- {
- svn_error_clear(err);
- return NULL;
- }
+ char *gpg_agent_info = NULL;
+ char *gnupghome = NULL;
+ const char *socket_name = NULL;
- /* Parse the gpgconf output.
- * The format of output is a list of directories/sockets with each
- * directory/socket listed on a separate line in format "field:/some/path" */
- eof = FALSE;
- while (((err = svn_io_file_readline(proc.out, &line, NULL, &eof, APR_SIZE_MAX,
- pool, pool)) == SVN_NO_ERROR)
- && !eof)
+ if ((gpg_agent_info = getenv("GPG_AGENT_INFO")) != NULL)
{
- if (strncmp(line->data, "agent-socket:", strlen("agent-socket:")) == 0)
- {
- apr_array_header_t *dir_details;
- dir_details = svn_cstring_split(line->data, ":", TRUE, pool);
- /* note: unescape_assuan modifies dir_details in place */
- agent_socket = unescape_assuan(APR_ARRAY_IDX(dir_details, 1, char*));
- break;
- }
+ apr_array_header_t *socket_details;
+
+ /* For reference GPG_AGENT_INFO consists of 3 : separated fields.
+ * The path to the socket, the pid of the gpg-agent process and
+ * finally the version of the protocol the agent talks. */
+ socket_details = svn_cstring_split(gpg_agent_info, ":", TRUE,
+ scratch_pool);
+ socket_name = APR_ARRAY_IDX(socket_details, 0, const char *);
}
- if (err != SVN_NO_ERROR)
+ else if ((gnupghome = getenv("GNUPGHOME")) != NULL)
{
- svn_error_clear(err);
- return NULL;
+ const char *homedir = svn_dirent_canonicalize(gnupghome, scratch_pool);
+ socket_name = svn_dirent_join(homedir, "S.gpg-agent", scratch_pool);
}
- apr_file_close(proc.out);
- err = svn_io_wait_for_cmd(&proc, "gpgconf", NULL, NULL, pool);
- if (err != SVN_NO_ERROR)
+ else
{
- svn_error_clear(err);
- return NULL;
+ int i = 0;
+ const char *maybe_socket[] = {NULL, NULL, NULL, NULL};
+ const char *homedir;
+
+#ifdef APR_HAS_USER
+ apr_uid_t uid;
+ apr_gid_t gid;
+
+ if (apr_uid_current(&uid, &gid, scratch_pool) == APR_SUCCESS)
+ {
+ const char *uidbuf = apr_psprintf(scratch_pool, "%lu",
+ (unsigned long)uid);
+ maybe_socket[i++] = svn_dirent_join_many(scratch_pool, "/run/user",
+ uidbuf, "gnupg",
+ "S.gpg-agent",
+ SVN_VA_NULL);
+ maybe_socket[i++] = svn_dirent_join_many(scratch_pool,
+ "/var/run/user",
+ uidbuf, "gnupg",
+ "S.gpg-agent",
+ SVN_VA_NULL);
+ }
+#endif
+
+ homedir = svn_user_get_homedir(scratch_pool);
+ if (homedir)
+ {
+ homedir = svn_dirent_canonicalize(homedir, scratch_pool);
+ maybe_socket[i++] = svn_dirent_join_many(scratch_pool, homedir,
+ ".gnupg", "S.gpg-agent",
+ SVN_VA_NULL);
+ }
+
+ for (i = 0; !socket_name && maybe_socket[i]; i++)
+ {
+ apr_finfo_t finfo;
+ svn_error_t *err = svn_io_stat(&finfo, maybe_socket[i],
+ APR_FINFO_TYPE, scratch_pool);
+ if (!err && finfo.filetype == APR_SOCK)
+ socket_name = maybe_socket[i];
+ svn_error_clear(err);
+ }
}
- return agent_socket;
+ if (socket_name)
+ socket_name = apr_pstrdup(result_pool, socket_name);
+
+ return socket_name;
}
/* Locate a running GPG Agent, and return an open file descriptor
@@ -294,9 +327,7 @@ static svn_error_t *
find_running_gpg_agent(int *new_sd, apr_pool_t *pool)
{
char *buffer;
- char *gpg_agent_info = NULL;
- char *gnupghome = NULL;
- const char *socket_name = NULL;
+ const char *socket_name = find_gpg_agent_socket(pool, pool);
const char *request = NULL;
const char *p = NULL;
char *ep = NULL;
@@ -304,46 +335,6 @@ find_running_gpg_agent(int *new_sd, apr_
*new_sd = -1;
- /* Query socket location using gpgconf if possible */
- socket_name = find_gpgconf_agent_socket(pool);
-
- /* fallback to the old method used with Gnupg 1.x */
- if (socket_name == NULL)
- {
- /* This implements the method of finding the socket as described in
- * the gpg-agent man page under the --use-standard-socket option.
- * The manage page says the standard socket is "named 'S.gpg-agent' located
- * in the home directory." GPG's home directory is either the directory
- * specified by $GNUPGHOME or ~/.gnupg. */
- if ((gpg_agent_info = getenv("GPG_AGENT_INFO")) != NULL)
- {
- apr_array_header_t *socket_details;
-
- /* For reference GPG_AGENT_INFO consists of 3 : separated fields.
- * The path to the socket, the pid of the gpg-agent process and
- * finally the version of the protocol the agent talks. */
- socket_details = svn_cstring_split(gpg_agent_info, ":", TRUE,
- pool);
- socket_name = APR_ARRAY_IDX(socket_details, 0, const char *);
- }
- else if ((gnupghome = getenv("GNUPGHOME")) != NULL)
- {
- const char *homedir = svn_dirent_canonicalize(gnupghome, pool);
- socket_name = svn_dirent_join(homedir, "S.gpg-agent", pool);
- }
- else
- {
- const char *homedir = svn_user_get_homedir(pool);
-
- if (!homedir)
- return SVN_NO_ERROR;
-
- homedir = svn_dirent_canonicalize(homedir, pool);
- socket_name = svn_dirent_join_many(pool, homedir, ".gnupg",
- "S.gpg-agent", SVN_VA_NULL);
- }
- }
-
if (socket_name != NULL)
{
struct sockaddr_un addr;