Rev 3927: Authentication.conf supports credential stores. '.netrc' is supported with a new plugin in http://bazaar.launchpad.net/%7Evila/bzr/bzr.integration
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Jan 8 10:03:20 GMT 2009
At http://bazaar.launchpad.net/%7Evila/bzr/bzr.integration
------------------------------------------------------------
revno: 3927
revision-id: v.ladeuil+lp at free.fr-20090108100235-isenc1r9djgxmqq8
parent: pqm at pqm.ubuntu.com-20090108001325-wcp1mp2u7a4li3na
parent: v.ladeuil+lp at free.fr-20090108094727-2slui8y2wp3gckxt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Thu 2009-01-08 11:02:35 +0100
message:
Authentication.conf supports credential stores. '.netrc' is supported with a new plugin
added:
bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
------------------------------------------------------------
revno: 3757.3.9
revision-id: v.ladeuil+lp at free.fr-20090108094727-2slui8y2wp3gckxt
parent: v.ladeuil+lp at free.fr-20081218155126-kmcxduzmb8dfl5le
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2009-01-08 10:47:27 +0100
message:
Fix typos as per Ian's review.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
------------------------------------------------------------
revno: 3757.3.8
revision-id: v.ladeuil+lp at free.fr-20081218155126-kmcxduzmb8dfl5le
parent: v.ladeuil+lp at free.fr-20081218083500-1iz4ff04lgav3mwp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2008-12-18 16:51:26 +0100
message:
Update doc and NEWS.
* doc/developers/authentication-ring.txt:
Update, including marking the parts not yet implemented.
* NEWS:
Add entries and fix order.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
------------------------------------------------------------
revno: 3757.3.7
revision-id: v.ladeuil+lp at free.fr-20081218083500-1iz4ff04lgav3mwp
parent: v.ladeuil+lp at free.fr-20081127130854-30cceqyphnc3ettt
parent: pqm at pqm.ubuntu.com-20081217102138-pz7pfli9o3k50zq7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2008-12-18 09:35:00 +0100
message:
merge bzr.dev
added:
bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 3757.3.6
revision-id: v.ladeuil+lp at free.fr-20081127130854-30cceqyphnc3ettt
parent: v.ladeuil+lp at free.fr-20081127094358-we45bv2ugfr522ih
parent: pqm at pqm.ubuntu.com-20081127093507-qn31zeicepc4g6li
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2008-11-27 14:08:54 +0100
message:
merge bzr.dev
added:
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
------------------------------------------------------------
revno: 3757.3.5
revision-id: v.ladeuil+lp at free.fr-20081127094358-we45bv2ugfr522ih
parent: v.ladeuil+lp at free.fr-20081016131315-xcw2fab24hr5fnze
parent: pqm at pqm.ubuntu.com-20081126094014-rr61dd2gkl53qthl
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2008-11-27 10:43:58 +0100
message:
Merge bzr.dev
added:
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
bzrlib/tests/fake_command.py fake_command.py-20081021195002-r9v65tgxx63c25v9-1
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
contrib/bzr_ssh_path_limiter bzr_ssh_path_limiter-20081030010544-xjhl0y2i6wyloz8q-1
contrib/convert_to_1.9.py convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
doc/developers/btree_index_prefetch.txt btree_index_request_-20081004155340-2u6apsy53f43f0xn-1
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
------------------------------------------------------------
revno: 3757.3.4
revision-id: v.ladeuil+lp at free.fr-20081016131315-xcw2fab24hr5fnze
parent: v.ladeuil+lp at free.fr-20081016131140-lcaz1iddwweplho3
parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2008-10-16 15:13:15 +0200
message:
Merge bzr.dev
added:
bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3757.3.3
revision-id: v.ladeuil+lp at free.fr-20081016131140-lcaz1iddwweplho3
parent: v.ladeuil+lp at free.fr-20081006100653-m74ulbg7rlfcuqox
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Thu 2008-10-16 15:11:40 +0200
message:
Aaron's feedback.
* plugins/netrc_credential_store/__init__.py:
(NetrcCredentialStore.decode_password): Better explanation.
modified:
bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
------------------------------------------------------------
revno: 3757.3.2
revision-id: v.ladeuil+lp at free.fr-20081006100653-m74ulbg7rlfcuqox
parent: v.ladeuil+lp at free.fr-20081005213200-tbgbnnhq6rjabnlz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-credential-stores
timestamp: Mon 2008-10-06 12:06:53 +0200
message:
Add a credential store for '.netrc'.
* plugins/netrc_credential_store/tests/test_netrc.py:
Associated tests.
* plugins/netrc_credential_store/tests/__init__.py:
Associated tests.
* plugins/netrc_credential_store/__init__.py:
Provides a credential store for .netrc. This also documents how to
plug a credential store for authentication.conf.
* tests/__init__.py:
(TestCaseInTempDir.build_tree): Drive-by fix, use assertIsInstance
instead of assert_ to get a meaningful error message.
added:
bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3757.3.1
revision-id: v.ladeuil+lp at free.fr-20081005213200-tbgbnnhq6rjabnlz
parent: pqm at pqm.ubuntu.com-20081001123103-9powbklax4nmw09j
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pluggable-auth-conf
timestamp: Sun 2008-10-05 23:32:00 +0200
message:
Add credential stores plugging.
* tests/test_config.py:
(TestAuthenticationConfigFile.test_unknown_password_encoding):
Test that the user get a meaningful error on typos or installation
problems.
(TestCredentialStoreRegistry): Basic tests for the registry.
(TestPlainTextCredentialStore): Test plain text credential store.
* config.py:
(AuthenticationConfig.decode_password): Go through the credential
store registry to decode the password.
(CredentialStoreRegistry): New registry for credential stores.
(CredentialStore): Abstract base class for credential stores.
(PlainTextCredentialStore): Default, plain text, credential store,
using authentication.conf file itself as storage(i.e actual
behavior).
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-01-08 00:13:25 +0000
+++ b/NEWS 2009-01-08 10:02:35 +0000
@@ -20,12 +20,18 @@
NEW FEATURES:
- * ``shelve --list`` can now be used to list shelved changes.
- (Aaron Bentley)
-
* Add support for `bzr tags -r 1..2`, that is we now support showing
tags applicable for a specified revision range. (Marius Kruger)
+ * ``authentication.conf`` now accepts pluggable read-only credential
+ stores. Such a plugin (``netrc_credential_store``) is now included,
+ handles the ``$HOME/.netrc`` file and can server as an example to
+ implement other plugins.
+ (Vincent Ladeuil)
+
+ * ``shelve --list`` can now be used to list shelved changes.
+ (Aaron Bentley)
+
IMPROVEMENTS:
* Add trailing slash to directories in all output of ``bzr ls``, except
@@ -70,6 +76,11 @@
editor, and emit warnings when a configured editor cannot be
started. (Andrew Bennetts)
+ * ``$HOME/.netrc`` file is now recognized as a read-only credential store
+ if configured in ``authentication.conf`` with 'password_encoding=netrc'
+ in the appropriate sections.
+ (Vincent Ladeuil, #103029)
+
* Preserve transport decorators while following redirections.
(Vincent Ladeuil, #245964, #270863)
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py 2008-11-25 17:19:26 +0000
+++ b/bzrlib/config.py 2008-11-27 09:43:58 +0000
@@ -78,6 +78,7 @@
errors,
mail_client,
osutils,
+ registry,
symbol_versioning,
trace,
ui,
@@ -1176,9 +1177,57 @@
return password
def decode_password(self, credentials, encoding):
+ try:
+ cs = credential_store_registry.get_credential_store(encoding)
+ except KeyError:
+ raise ValueError('%r is not a known password_encoding' % encoding)
+ credentials['password'] = cs.decode_password(credentials)
return credentials
+class CredentialStoreRegistry(registry.Registry):
+ """A class that registers credential stores.
+
+ A credential store provides access to credentials via the password_encoding
+ field in authentication.conf sections.
+
+ Except for stores provided by bzr itself,most stores are expected to be
+ provided by plugins that will therefore use
+ register_lazy(password_encoding, module_name, member_name, help=help,
+ info=info) to install themselves.
+ """
+
+ def get_credential_store(self, encoding=None):
+ cs = self.get(encoding)
+ if callable(cs):
+ cs = cs()
+ return cs
+
+
+credential_store_registry = CredentialStoreRegistry()
+
+
+class CredentialStore(object):
+ """An abstract class to implement storage for credentials"""
+
+ def decode_password(self, credentials):
+ """Returns a password for the provided credentials in clear text."""
+ raise NotImplementedError(self.decode_password)
+
+
+class PlainTextCredentialStore(CredentialStore):
+ """Plain text credential store for the authentication.conf file."""
+
+ def decode_password(self, credentials):
+ """See CredentialStore.decode_password."""
+ return credentials['password']
+
+
+credential_store_registry.register('plain', PlainTextCredentialStore,
+ help=PlainTextCredentialStore.__doc__)
+credential_store_registry.default_key = 'plain'
+
+
class BzrDirConfig(object):
def __init__(self, transport):
=== added directory 'bzrlib/plugins/netrc_credential_store'
=== added file 'bzrlib/plugins/netrc_credential_store/__init__.py'
--- a/bzrlib/plugins/netrc_credential_store/__init__.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/plugins/netrc_credential_store/__init__.py 2008-10-16 13:11:40 +0000
@@ -0,0 +1,70 @@
+# Copyright (C) 2008 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""Use ~/.netrc as a credential store for authentication.conf."""
+
+from bzrlib import (
+ config,
+ lazy_import,
+ )
+
+lazy_import.lazy_import(globals(), """
+ import errno
+ import netrc
+
+ from bzrlib import (
+ errors,
+ )
+""")
+
+
+class NetrcCredentialStore(config.CredentialStore):
+
+ def __init__(self):
+ super(NetrcCredentialStore, self).__init__()
+ try:
+ self._netrc = netrc.netrc()
+ except IOError, e:
+ if e.args[0] == errno.ENOENT:
+ raise errors.NoSuchFile(e.filename)
+ else:
+ raise
+
+ def decode_password(self, credentials):
+ auth = self._netrc.authenticators(credentials['host'])
+ password = None
+ if auth is not None:
+ user, account, password = auth
+ cred_user = credentials.get('user', None)
+ if cred_user is None or user != cred_user:
+ # We don't use the netrc ability to provide a user since there
+ # is no way to give it back to AuthConfig. So if the user
+ # doesn't match, we don't return a password.
+ password = None
+ return password
+
+
+config.credential_store_registry.register_lazy(
+ 'netrc', __name__, 'NetrcCredentialStore', help=__doc__)
+
+
+def load_tests(basic_tests, module, loader):
+ testmod_names = [
+ 'tests',
+ ]
+ basic_tests.addTest(loader.loadTestsFromModuleNames(
+ ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
+ return basic_tests
=== added directory 'bzrlib/plugins/netrc_credential_store/tests'
=== added file 'bzrlib/plugins/netrc_credential_store/tests/__init__.py'
--- a/bzrlib/plugins/netrc_credential_store/tests/__init__.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/plugins/netrc_credential_store/tests/__init__.py 2008-10-06 10:06:53 +0000
@@ -0,0 +1,23 @@
+# Copyright (C) 2008 by Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+def load_tests(basic_tests, module, loader):
+ testmod_names = [
+ 'test_netrc',
+ ]
+ basic_tests.addTest(loader.loadTestsFromModuleNames(
+ ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
+ return basic_tests
=== added file 'bzrlib/plugins/netrc_credential_store/tests/test_netrc.py'
--- a/bzrlib/plugins/netrc_credential_store/tests/test_netrc.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/plugins/netrc_credential_store/tests/test_netrc.py 2008-10-06 10:06:53 +0000
@@ -0,0 +1,71 @@
+# Copyright (C) 2008 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+from bzrlib import (
+ config,
+ errors,
+ osutils,
+ tests,
+ )
+
+from bzrlib.plugins import netrc_credential_store
+
+
+class TestNetrcCSNoNetrc(tests.TestCaseInTempDir):
+
+ def test_home_netrc_does_not_exist(self):
+ self.assertRaises(errors.NoSuchFile,
+ config.credential_store_registry.get_credential_store,
+ 'netrc')
+
+
+class TestNetrcCS(tests.TestCaseInTempDir):
+
+ def setUp(self):
+ super(TestNetrcCS, self).setUp()
+ # Create a .netrc file
+ netrc_content = """
+machine host login joe password secret
+default login anonymous password joe at home
+"""
+ f = open(osutils.pathjoin(self.test_home_dir, '.netrc'), 'wb')
+ try:
+ f.write(netrc_content)
+ finally:
+ f.close()
+
+ def _get_netrc_cs(self):
+ return config.credential_store_registry.get_credential_store('netrc')
+
+ def test_not_matching_user(self):
+ cs = self._get_netrc_cs()
+ password = cs.decode_password(dict(host='host', user='jim'))
+ self.assertIs(None, password)
+
+ def test_matching_user(self):
+ cs = self._get_netrc_cs()
+ password = cs.decode_password(dict(host='host', user='joe'))
+ self.assertEquals('secret', password)
+
+ def test_default_password(self):
+ cs = self._get_netrc_cs()
+ password = cs.decode_password(dict(host='other', user='anonymous'))
+ self.assertEquals('joe at home', password)
+
+ def test_default_password_without_user(self):
+ cs = self._get_netrc_cs()
+ password = cs.decode_password(dict(host='other'))
+ self.assertIs(None, password)
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-12-19 20:08:18 +0000
+++ b/bzrlib/tests/__init__.py 2009-01-08 10:02:35 +0000
@@ -2138,7 +2138,7 @@
if transport is None or transport.is_readonly():
transport = get_transport(".")
for name in shape:
- self.assert_(isinstance(name, basestring))
+ self.assertIsInstance(name, basestring)
if name[-1] == '/':
transport.mkdir(urlutils.escape(name[:-1]))
else:
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py 2008-10-16 18:30:32 +0000
+++ b/bzrlib/tests/test_config.py 2008-11-27 09:43:58 +0000
@@ -1263,6 +1263,16 @@
"""))
self.assertRaises(ValueError, conf.get_credentials, 'ftp', 'foo.net')
+ def test_unknown_password_encoding(self):
+ conf = config.AuthenticationConfig(_file=StringIO(
+ """[broken]
+scheme=ftp
+user=joe
+password_encoding=unknown
+"""))
+ self.assertRaises(ValueError, conf.get_password,
+ 'ftp', 'foo.net', 'joe')
+
def test_credentials_for_scheme_host(self):
conf = config.AuthenticationConfig(_file=StringIO(
"""# Identity on foo.net
@@ -1526,6 +1536,32 @@
'password ignored in section \[ssh with password\]')
+class TestCredentialStoreRegistry(tests.TestCase):
+
+ def _get_cs_registry(self):
+ return config.credential_store_registry
+
+ def test_default_credential_store(self):
+ r = self._get_cs_registry()
+ default = r.get_credential_store(None)
+ self.assertIsInstance(default, config.PlainTextCredentialStore)
+
+ def test_unknown_credential_store(self):
+ r = self._get_cs_registry()
+ # It's hard to imagine someone creating a credential store named
+ # 'unknown' so we use that as an never registered key.
+ self.assertRaises(KeyError, r.get_credential_store, 'unknown')
+
+
+class TestPlainTextCredentialStore(tests.TestCase):
+
+ def test_decode_password(self):
+ r = config.credential_store_registry
+ plain_text = r.get_credential_store()
+ decoded = plain_text.decode_password(dict(password='secret'))
+ self.assertEquals('secret', decoded)
+
+
# FIXME: Once we have a way to declare authentication to all test servers, we
# can implement generic tests.
# test_user_password_in_url
=== modified file 'doc/developers/authentication-ring.txt'
--- a/doc/developers/authentication-ring.txt 2008-05-09 16:40:21 +0000
+++ b/doc/developers/authentication-ring.txt 2009-01-08 09:47:27 +0000
@@ -40,7 +40,7 @@
This specification also proposes a way to describe credentials so that several
remote branches can use the same definition. This is particularily important
-for users handling a lot of passwords who need to update them on a regular
+for users handling a lot of passwords and who need to update them on a regular
basis.
Rationale
@@ -65,7 +65,8 @@
``password``) and, when used with appropriate agents, provide the same kind of
comfort this specification aims to provide for all other schemes. Since ssh
agents provide a safer way to secure the passwords, this specification is
-restricted to providing ``user`` but does not provide ``password``.
+restricted to providing ``user`` but does not provide ``password`` when used
+for ssh.
Authentication definitions
--------------------------
@@ -89,7 +90,7 @@
when prompting for the password (unless someone found a way to declare two
different realms for the same path).
-``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitely
+``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly
specifying the appropriate port.
.. [#ignored_realm] The true purpose of realms is to allow the same credentials
@@ -112,10 +113,10 @@
same scheme), only numerical values are allowed, this should be used only
when the server uses a port different than the scheme standard port,
- * ``path``: can be empty (FTP or SFTP will never user it),
+ * ``path``: can be empty (FTP or SFTP will never use it),
* ``user``: can be empty (``bzr`` will defaults to python's
- ``getpass.get_user()`` and attempt another matching(see below)),
+ ``getpass.get_user()`` for FTP, SFTP and ssh),
* ``password``: can be empty (for security reasons, a user may use the
definitions without storing the passwords but want to be prompted ; or the
@@ -127,7 +128,8 @@
Also note that an optional ``verify_certificates=no`` field will allow the
connection to ``HTTPS`` hosts that provides a self certified certificate (the
-default should be to refuse the connection and inform the user).
+default should be to refuse the connection and inform the user). (Not
+implemented yet)
Multiple definitions can be provided and, for a given URL, bzr will select a
(``user`` [, ``password``]) based on the following rules :
@@ -156,11 +158,14 @@
Encoding passwords in ``base64``, while weak, provides protection against
accidental reading (if an administrator have to look into the file, he will not
-see the passwords in clear).
+see the passwords in clear).(Not implemented yet).
-This specification intend to ease the authentication providing, not to secure
+This specification intends to ease the authentication providing, not to secure
it in the best possible way.
+Plugins can provide additional password encodings. The provided
+``netrc_credential_store`` plugin can be used as an example implementation.
+
Future versions of this specification may provide additional
encodings [#password_encoding]_.
@@ -168,8 +173,8 @@
that will rely on external means to store the password which, in these
cases, will not appear anymore in the definition. It is assumed that
additional password encodings will provide a storage outside of the file
- described here. An encoding named ``netrc`` for example will provide
- passwords by retrieving them in the ``.netrc`` file.
+ described here. The ``netrc`` encoding, for example, provides passwords by
+ retrieving them from the ``.netrc`` file.
File format
-----------
@@ -187,7 +192,7 @@
generally servers. The same authentification definition can even be used
for several schemes for servers providing those schemes.
-``~/.bazaar/authentication.conf`` will use the same file format than
+``~/.bazaar/authentication.conf`` will use the same file format as
``~/.bazaar/bazaar.conf``.
Each section describes an authentication definition.
@@ -324,7 +329,7 @@
3. No ``user`` given in the URL (and no ``password``).
Get a user from ``~/.bazaar/authentication.conf`` or prompt for one if none is
- found. Continue as 2.
+ found. Continue as 2. (Not implemented yet)
Note: A user will be queried only if the server requires it for ``HTTP`` or
``HTTPS``, other protocols always require a user.
@@ -356,9 +361,10 @@
a password.
* As this specification proposes a matching between some credentials
- definitions and real urls, the implementation should provide an optional UI
- feedback about which credential definition is used. That will allow the user
- to validate his definitions.
+ definitions and real urls, the implementation provides an optional UI
+ feedback about which credential definition is used. Using ``-Dauth`` will
+ output some traces in the ``.bzr.log`` file metionning the sections
+ used. This allows the user to validate his definitions.
Questions and Answers
---------------------
@@ -372,15 +378,14 @@
* What if a ``.netrc`` file exists ?
- * It will be honored if the definition specifies
- ``password_encoding=netrc`` once the appropriate plugin have been
- written.
+ * It is honored if the definition specifies
+ ``password_encoding=netrc``.
* What mode should the authentication file use ?
* 600 read/write for owner only by default, if another mode (more
permissive) is used, a warning will be issued to inform the users of the
- potential risks.
+ potential risks.(Not implemented yet)
* What about using ``seahorse`` on Ubuntu or ``KeyChain Access`` on Mac OS X ?
@@ -391,8 +396,9 @@
?
* yes and if the user configure a ssh-agent it will not be queried for
- pass-phrase every time we want to query the file for a password. But that
- seems a bit extreme for a first version.
+ pass-phrase every time we want to query the file for a password. But
+ that seems a bit extreme for a first version.(Not implemented yet and
+ may be never)
* Why can't bzr update the authentication file when it queried the user for a
password ?
More information about the bazaar-commits
mailing list