author | Brock Pytlik <bpytlik@sun.com> |
Thu, 05 Mar 2009 19:43:19 -0800 | |
changeset 916 | b05c5a1a600f |
parent 873 | b95d76c53b5e |
child 965 | 6efb5042a707 |
permissions | -rwxr-xr-x |
409
713e20963dc2
2314 shebang lines should use minimum python version
Shawn Walker <swalker@opensolaris.org>
parents:
404
diff
changeset
|
1 |
#!/usr/bin/python2.4 |
20
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
2 |
# |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
3 |
# CDDL HEADER START |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
4 |
# |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
5 |
# The contents of this file are subject to the terms of the |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
6 |
# Common Development and Distribution License (the "License"). |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
7 |
# You may not use this file except in compliance with the License. |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
8 |
# |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
9 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
10 |
# or http://www.opensolaris.org/os/licensing. |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
11 |
# See the License for the specific language governing permissions |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
12 |
# and limitations under the License. |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
13 |
# |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
14 |
# When distributing Covered Code, include this CDDL HEADER in each |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
15 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
16 |
# If applicable, add the following below this CDDL HEADER, with the |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
17 |
# fields enclosed by brackets "[]" replaced with your own identifying |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
18 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
19 |
# |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
20 |
# CDDL HEADER END |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
21 |
# |
814
76909c2cad8f
5603 server catalog permissions should be 644, not 600
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
812
diff
changeset
|
22 |
# Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
20
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
23 |
# Use is subject to license terms. |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
24 |
# |
e5e53bc1c4d1
Cleaned up the build and install process. Turn the pkg directory into a
Danek Duvall <danek.duvall@sun.com>
parents:
14
diff
changeset
|
25 |
|
22
379f0f6809ff
pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents:
21
diff
changeset
|
26 |
# pkg.depotd - package repository daemon |
0
f08899079fb4
implemented open, add (file case), close for transactions
"Stephen Hahn <sch@sun.com>"
parents:
diff
changeset
|
27 |
|
50 | 28 |
# XXX The prototype pkg.depotd combines both the version management server that |
29 |
# answers to pkgsend(1) sessions and the HTTP file server that answers to the |
|
30 |
# various GET operations that a pkg(1) client makes. This split is expected to |
|
31 |
# be made more explicit, by constraining the pkg(1) operations such that they |
|
32 |
# can be served as a typical HTTP/HTTPS session. Thus, pkg.depotd will reduce |
|
33 |
# to a special purpose HTTP/HTTPS server explicitly for the version management |
|
34 |
# operations, and must manipulate the various state files--catalogs, in |
|
35 |
# particular--such that the pkg(1) pull client can operately accurately with |
|
36 |
# only a basic HTTP/HTTPS server in place. |
|
37 |
||
38 |
# XXX We should support simple "last-modified" operations via HEAD queries. |
|
39 |
||
40 |
# XXX Although we pushed the evaluation of next-version, etc. to the pull |
|
41 |
# client, we should probably provide a query API to do same on the server, for |
|
42 |
# dumb clients (like a notification service). |
|
43 |
||
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
44 |
# The default authority for the depot. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
45 |
AUTH_DEFAULT = "opensolaris.org" |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
46 |
# The default repository path. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
47 |
REPO_PATH_DEFAULT = "/var/pkg/repo" |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
48 |
# The default path for static and other web content. |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
49 |
CONTENT_PATH_DEFAULT = "/usr/share/lib/pkg" |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
50 |
# The default port(s) to serve data from. |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
51 |
PORT_DEFAULT = 80 |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
52 |
SSL_PORT_DEFAULT = 443 |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
53 |
# The minimum number of threads allowed. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
54 |
THREADS_MIN = 1 |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
55 |
# The default number of threads to start. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
56 |
THREADS_DEFAULT = 10 |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
57 |
# The maximum number of threads that can be started. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
58 |
THREADS_MAX = 100 |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
59 |
# The default server socket timeout in seconds. We want this to be longer than |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
60 |
# the normal default of 10 seconds to accommodate clients with poor quality |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
61 |
# connections. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
62 |
SOCKET_TIMEOUT_DEFAULT = 60 |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
63 |
# Whether modify operations should be allowed. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
64 |
READONLY_DEFAULT = False |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
65 |
# Whether the repository catalog should be rebuilt on startup. |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
66 |
REBUILD_DEFAULT = False |
429
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
67 |
# Whether the indexes should be rebuilt |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
68 |
REINDEX_DEFAULT = False |
461
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
69 |
# Not in mirror mode by default |
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
70 |
MIRROR_DEFAULT = False |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
71 |
|
26 | 72 |
import getopt |
689
1cb7154e1592
4489 depot traceback for info operation due to changeset 660
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
617
diff
changeset
|
73 |
import gettext |
1cb7154e1592
4489 depot traceback for info operation due to changeset 660
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
617
diff
changeset
|
74 |
import locale |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
75 |
import logging |
0
f08899079fb4
implemented open, add (file case), close for transactions
"Stephen Hahn <sch@sun.com>"
parents:
diff
changeset
|
76 |
import os |
468
20250d58c2ab
2309 pkg.depotd fails when -d argument is a relative pathname
Tom Mueller <Tom.Mueller@sun.com>
parents:
466
diff
changeset
|
77 |
import os.path |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
78 |
import OpenSSL.crypto as crypto |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
79 |
import subprocess |
52
d7c452ef7ae1
Sanitize getopt exception handling
Danek Duvall <danek.duvall@sun.com>
parents:
50
diff
changeset
|
80 |
import sys |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
81 |
import tempfile |
451
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
82 |
import urlparse |
0
f08899079fb4
implemented open, add (file case), close for transactions
"Stephen Hahn <sch@sun.com>"
parents:
diff
changeset
|
83 |
|
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
84 |
try: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
85 |
import cherrypy |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
86 |
version = cherrypy.__version__.split('.') |
452
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
87 |
if map(int, version) < [3, 1, 0]: |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
88 |
raise ImportError |
452
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
89 |
elif map(int, version) >= [3, 2, 0]: |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
90 |
raise ImportError |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
91 |
except ImportError: |
751
b68bf0bec185
5466 depot should give a clear failure message if unable to import mako templates
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
742
diff
changeset
|
92 |
print >> sys.stderr, """cherrypy 3.1.0 or greater (but less than """ \ |
b68bf0bec185
5466 depot should give a clear failure message if unable to import mako templates
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
742
diff
changeset
|
93 |
"""3.2.0) is required to use this program.""" |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
94 |
sys.exit(2) |
22
379f0f6809ff
pkgsend open, pkgsend add file, pkgsend close; Transaction object
"Stephen Hahn <sch@sun.com>"
parents:
21
diff
changeset
|
95 |
|
814
76909c2cad8f
5603 server catalog permissions should be 644, not 600
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
812
diff
changeset
|
96 |
import pkg.catalog as catalog |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
97 |
from pkg.misc import port_available, msg, emsg, setlocale |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
98 |
import pkg.portable.util as os_util |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
99 |
import pkg.search_errors as search_errors |
26 | 100 |
import pkg.server.config as config |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
101 |
import pkg.server.depot as depot |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
102 |
import pkg.server.depotresponse as dr |
428
e011e45fe2cd
2239 repository attribute system needed
Shawn Walker <shawn.walker@sun.com>
parents:
409
diff
changeset
|
103 |
import pkg.server.repositoryconfig as rc |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
104 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
105 |
class LogSink(object): |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
106 |
"""This is a dummy object that we can use to discard log entries |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
107 |
without relying on non-portable interfaces such as /dev/null.""" |
23
51b8b48fea32
begin server source reorganization
"Stephen Hahn <sch@sun.com>"
parents:
22
diff
changeset
|
108 |
|
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
109 |
def write(self, *args, **kwargs): |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
110 |
"""Discard the bits.""" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
111 |
pass |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
112 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
113 |
def flush(self, *args, **kwargs): |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
114 |
"""Discard the bits.""" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
115 |
pass |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
116 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
117 |
def usage(text): |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
118 |
if text: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
119 |
emsg(text) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
120 |
|
26 | 121 |
print """\ |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
122 |
Usage: /usr/lib/pkg.depotd [-d repo_dir] [-p port] [-s threads] |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
123 |
[-t socket_timeout] [--cfg-file] [--content-root] [--debug] |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
124 |
[--log-access dest] [--log-errors dest] [--mirror] [--proxy-base url] |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
125 |
[--readonly] [--rebuild] [--ssl-cert-file] [--ssl-dialog] |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
126 |
[--ssl-key-file] |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
127 |
|
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
128 |
--cfg-file The pathname of the file from which to read and to |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
129 |
write configuration information. |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
130 |
--content-root The file system path to the directory containing the |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
131 |
the static and other web content used by the depot's |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
132 |
browser user interface. The default value is |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
133 |
'/usr/share/lib/pkg'. |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
134 |
--debug The name of a debug feature to enable; or a whitespace |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
135 |
or comma separated list of features to enable. Possible |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
136 |
values are: headers. |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
137 |
--log-access The destination for any access related information |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
138 |
logged by the depot process. Possible values are: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
139 |
stderr, stdout, none, or an absolute pathname. The |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
140 |
default value is stdout if stdout is a tty; otherwise |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
141 |
the default value is none. |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
142 |
--log-errors The destination for any errors or other information |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
143 |
logged by the depot process. Possible values are: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
144 |
stderr, stdout, none, or an absolute pathname. The |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
145 |
default value is stderr. |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
146 |
--mirror Package mirror mode; publishing and metadata operations |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
147 |
disallowed. Cannot be used with --readonly or |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
148 |
--rebuild. |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
149 |
--proxy-base The url to use as the base for generating internal |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
150 |
redirects and content. |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
151 |
--readonly Read-only operation; modifying operations disallowed. |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
152 |
Cannot be used with --mirror or --rebuild. |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
153 |
--rebuild Re-build the catalog from pkgs in depot. Cannot be |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
154 |
used with --mirror or --readonly. |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
155 |
--ssl-cert-file The absolute pathname to a PEM-encoded Certificate file. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
156 |
This option must be used with --ssl-key-file. Usage of |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
157 |
this option will cause the depot to only respond to SSL |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
158 |
requests on the provided port. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
159 |
--ssl-dialog Specifies what method should be used to obtain the |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
160 |
passphrase needed to decrypt the file specified by |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
161 |
--ssl-key-file. Supported values are: builtin, |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
162 |
exec:/path/to/program, or smf:fmri. The default value |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
163 |
is builtin. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
164 |
--ssl-key-file The absolute pathname to a PEM-encoded Private Key file. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
165 |
This option must be used with --ssl-cert-file. Usage of |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
166 |
this option will cause the depot to only respond to SSL |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
167 |
requests on the provided port. |
26 | 168 |
""" |
135
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
169 |
sys.exit(2) |
14
969c85e852af
start pkg graph management, annotate pkgsend with server states
"Stephen Hahn <sch@sun.com>"
parents:
3
diff
changeset
|
170 |
|
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
171 |
class OptionError(Exception): |
429
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
172 |
"""Option exception. """ |
14
969c85e852af
start pkg graph management, annotate pkgsend with server states
"Stephen Hahn <sch@sun.com>"
parents:
3
diff
changeset
|
173 |
|
404
e5329e84b9a8
2331 depot command-line parsing errors cause traceback
Shawn Walker <swalker@opensolaris.org>
parents:
386
diff
changeset
|
174 |
def __init__(self, *args): |
e5329e84b9a8
2331 depot command-line parsing errors cause traceback
Shawn Walker <swalker@opensolaris.org>
parents:
386
diff
changeset
|
175 |
Exception.__init__(self, *args) |
30 | 176 |
|
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
177 |
if __name__ == "__main__": |
30 | 178 |
|
791
123e9401e939
5778 Inability to set locale leads to stack trace
Danek Duvall <danek.duvall@sun.com>
parents:
775
diff
changeset
|
179 |
setlocale(locale.LC_ALL, "") |
689
1cb7154e1592
4489 depot traceback for info operation due to changeset 660
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
617
diff
changeset
|
180 |
gettext.install("pkg", "/usr/share/locale") |
1cb7154e1592
4489 depot traceback for info operation due to changeset 660
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
617
diff
changeset
|
181 |
|
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
182 |
debug_features = { |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
183 |
"headers": False, |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
184 |
} |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
185 |
port = PORT_DEFAULT |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
186 |
port_provided = False |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
187 |
threads = THREADS_DEFAULT |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
188 |
socket_timeout = SOCKET_TIMEOUT_DEFAULT |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
189 |
readonly = READONLY_DEFAULT |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
190 |
rebuild = REBUILD_DEFAULT |
429
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
191 |
reindex = REINDEX_DEFAULT |
451
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
192 |
proxy_base = None |
461
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
193 |
mirror = MIRROR_DEFAULT |
797
fddb78531f55
5211 cfg_cache needs to be able to live elsewhere
Brock Pytlik <bpytlik@sun.com>
parents:
791
diff
changeset
|
194 |
repo_config_file = None |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
195 |
ssl_cert_file = None |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
196 |
ssl_key_file = None |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
197 |
ssl_dialog = "builtin" |
258
b3b7592412ec
270 Need ability to rename packages
johansen <johansen@sun.com>
parents:
239
diff
changeset
|
198 |
|
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
199 |
if "PKG_REPO" in os.environ: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
200 |
repo_path = os.environ["PKG_REPO"] |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
201 |
else: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
202 |
repo_path = REPO_PATH_DEFAULT |
30 | 203 |
|
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
204 |
try: |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
205 |
content_root = os.environ["PKG_DEPOT_CONTENT"] |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
206 |
except KeyError: |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
207 |
try: |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
208 |
content_root = os.path.join(os.environ['PKG_HOME'], |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
209 |
'share/lib/pkg') |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
210 |
except KeyError: |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
211 |
content_root = CONTENT_PATH_DEFAULT |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
212 |
|
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
213 |
# By default, if the destination for a particular log type is not |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
214 |
# specified, this is where we will send the output. |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
215 |
log_routes = { |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
216 |
"access": "none", |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
217 |
"errors": "stderr" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
218 |
} |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
219 |
log_opts = ["--log-%s" % log_type for log_type in log_routes] |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
220 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
221 |
# If stdout is a tty, then send access output there by default instead |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
222 |
# of discarding it. |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
223 |
if os.isatty(sys.stdout.fileno()): |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
224 |
log_routes["access"] = "stdout" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
225 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
226 |
opt = None |
54
a0c517c20618
Don't throw an exception if the depot can't find a file
Danek Duvall <danek.duvall@sun.com>
parents:
52
diff
changeset
|
227 |
try: |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
228 |
long_opts = ["cfg-file=", "content-root=", "debug=", "mirror", |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
229 |
"proxy-base=", "readonly", "rebuild", "refresh-index", |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
230 |
"ssl-cert-file=", "ssl-dialog=", "ssl-key-file="] |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
231 |
for opt in log_opts: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
232 |
long_opts.append("%s=" % opt.lstrip('--')) |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
233 |
opts, pargs = getopt.getopt(sys.argv[1:], "d:np:s:t:", |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
234 |
long_opts) |
135
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
235 |
for opt, arg in opts: |
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
236 |
if opt == "-n": |
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
237 |
sys.exit(0) |
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
238 |
elif opt == "-d": |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
239 |
repo_path = arg |
135
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
240 |
elif opt == "-p": |
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
241 |
port = int(arg) |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
242 |
port_provided = True |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
243 |
elif opt == "-s": |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
244 |
threads = int(arg) |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
245 |
if threads < THREADS_MIN: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
246 |
raise OptionError, \ |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
247 |
"minimum value is %d" % THREADS_MIN |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
248 |
if threads > THREADS_MAX: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
249 |
raise OptionError, \ |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
250 |
"maximum value is %d" % THREADS_MAX |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
251 |
elif opt == "-t": |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
252 |
socket_timeout = int(arg) |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
253 |
elif opt == "--cfg-file": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
254 |
repo_config_file = os.path.abspath(arg) |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
255 |
elif opt == "--content-root": |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
256 |
if arg == "": |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
257 |
raise OptionError, "You must specify " \ |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
258 |
"a directory path." |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
259 |
content_root = arg |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
260 |
elif opt == "--debug": |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
261 |
if arg is None or arg == "": |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
262 |
raise OptionError, \ |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
263 |
"A debug feature must be specified." |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
264 |
|
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
265 |
# A list of features can be specified using a |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
266 |
# "," or any whitespace character as separators. |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
267 |
if "," in arg: |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
268 |
features = arg.split(",") |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
269 |
else: |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
270 |
features = arg.split() |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
271 |
|
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
272 |
for f in features: |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
273 |
if f not in debug_features: |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
274 |
raise OptionError, \ |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
275 |
"Invalid debug feature: " \ |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
276 |
"%s." % f |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
277 |
debug_features[f] = True |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
278 |
elif opt in log_opts: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
279 |
if arg is None or arg == "": |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
280 |
raise OptionError, \ |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
281 |
"You must specify a log " \ |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
282 |
"destination." |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
283 |
log_routes[opt.lstrip("--log-")] = arg |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
284 |
elif opt == "--mirror": |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
285 |
mirror = True |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
286 |
elif opt == "--proxy-base": |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
287 |
# Attempt to decompose the url provided into |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
288 |
# its base parts. This is done so we can |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
289 |
# remove any scheme information since we |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
290 |
# don't need it. |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
291 |
scheme, netloc, path, params, query, \ |
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
292 |
fragment = urlparse.urlparse(arg, |
765
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
293 |
"http", allow_fragments=0) |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
294 |
|
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
295 |
if not netloc: |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
296 |
raise OptionError, "Unable to " \ |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
297 |
"determine the hostname from " \ |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
298 |
"the provided URL; please use a " \ |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
299 |
"fully qualified URL." |
589
2480ab0274d1
242 desire ability to set content root
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
468
diff
changeset
|
300 |
|
765
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
301 |
scheme = scheme.lower() |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
302 |
if scheme not in ("http", "https"): |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
303 |
raise OptionError, "Invalid URL; http " \ |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
304 |
"and https are the only supported " \ |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
305 |
"schemes." |
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
306 |
|
3cc1f2dff092
5668 proxy base should allow https
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
751
diff
changeset
|
307 |
# Rebuild the url with the sanitized components. |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
308 |
proxy_base = urlparse.urlunparse((scheme, |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
309 |
netloc, path, params, query, fragment)) |
135
a1e20e9a9845
add CLI test suite, correct bugs found by test suite, ration out CLI options
Stephen Hahn <sch@Sun.COM>
parents:
119
diff
changeset
|
310 |
elif opt == "--readonly": |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
311 |
readonly = True |
157
504b9e6d213c
Catalog should be on-disk instead of in memory
johansen <johansen@sun.com>
parents:
146
diff
changeset
|
312 |
elif opt == "--rebuild": |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
313 |
rebuild = True |
429
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
314 |
elif opt == "--refresh-index": |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
315 |
# Note: This argument is for internal use |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
316 |
# only. It's used when pkg.depotd is reexecing |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
317 |
# itself and needs to know that's the case. |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
318 |
# This flag is purposefully omitted in usage. |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
319 |
# The supported way to forcefully reindex is to |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
320 |
# kill any pkg.depot using that directory, |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
321 |
# remove the index directory, and restart the |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
322 |
# pkg.depot process. The index will be rebuilt |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
323 |
# automatically on startup. |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
324 |
reindex = True |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
325 |
elif opt == "--ssl-cert-file": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
326 |
if arg == "none": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
327 |
continue |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
328 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
329 |
ssl_cert_file = arg |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
330 |
if not os.path.isabs(ssl_cert_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
331 |
raise OptionError, "The path to " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
332 |
"the Certificate file must be " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
333 |
"absolute." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
334 |
elif not os.path.exists(ssl_cert_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
335 |
raise OptionError, "The specified " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
336 |
"file does not exist." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
337 |
elif not os.path.isfile(ssl_cert_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
338 |
raise OptionError, "The specified " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
339 |
"pathname is not a file." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
340 |
elif opt == "--ssl-key-file": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
341 |
if arg == "none": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
342 |
continue |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
343 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
344 |
ssl_key_file = arg |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
345 |
if not os.path.isabs(ssl_key_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
346 |
raise OptionError, "The path to " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
347 |
"the Private Key file must be " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
348 |
"absolute." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
349 |
elif not os.path.exists(ssl_key_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
350 |
raise OptionError, "The specified " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
351 |
"file does not exist." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
352 |
elif not os.path.isfile(ssl_key_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
353 |
raise OptionError, "The specified " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
354 |
"pathname is not a file." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
355 |
elif opt == "--ssl-dialog": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
356 |
if arg != "builtin" and not \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
357 |
arg.startswith("exec:/") and not \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
358 |
arg.startswith("smf:"): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
359 |
raise OptionError, "Invalid value " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
360 |
"specified. Expected: builtin, " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
361 |
"exec:/path/to/program, or " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
362 |
"smf:fmri." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
363 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
364 |
f = arg |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
365 |
if f.startswith("exec:"): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
366 |
if os_util.get_canonical_os_type() != \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
367 |
"unix": |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
368 |
# Don't allow a somewhat |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
369 |
# insecure authentication method |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
370 |
# on some platforms. |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
371 |
raise OptionError, "exec is " \ |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
372 |
"not a supported dialog " \ |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
373 |
"type for this operating " \ |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
374 |
"system." |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
375 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
376 |
f = os.path.abspath(f.split( |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
377 |
"exec:")[1]) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
378 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
379 |
if not os.path.isfile(f): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
380 |
raise OptionError, "Invalid " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
381 |
"file path specified for " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
382 |
"exec." |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
383 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
384 |
f = "exec:%s" % f |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
385 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
386 |
ssl_dialog = f |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
387 |
except getopt.GetoptError, _e: |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
388 |
usage("pkg.depotd: %s" % _e.msg) |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
389 |
except OptionError, _e: |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
390 |
usage("pkg.depotd: option: %s -- %s" % (opt, _e)) |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
391 |
except (ArithmeticError, ValueError): |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
392 |
usage("pkg.depotd: illegal option value: %s specified " \ |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
393 |
"for option: %s" % (arg, opt)) |
451
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
394 |
|
445
76b03dd5a4ac
2693 Indexing code and catalog code should respect --read-only
Brock Pytlik <bpytlik@sun.com>
parents:
429
diff
changeset
|
395 |
if rebuild and reindex: |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
396 |
usage("--refresh-index cannot be used with --rebuild") |
461
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
397 |
if rebuild and (readonly or mirror): |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
398 |
usage("--readonly and --mirror cannot be used with --rebuild") |
461
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
399 |
if reindex and (readonly or mirror): |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
400 |
usage("--readonly and --mirror cannot be used with " \ |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
401 |
"--refresh-index") |
451
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
402 |
|
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
403 |
if (ssl_cert_file and not ssl_key_file) or (ssl_key_file and not |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
404 |
ssl_cert_file): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
405 |
usage("The --ssl-cert-file and --ssl-key-file options must " |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
406 |
"must both be provided when using either option.") |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
407 |
elif ssl_cert_file and ssl_key_file and not port_provided: |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
408 |
# If they didn't already specify a particular port, use the |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
409 |
# default SSL port instead. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
410 |
port = SSL_PORT_DEFAULT |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
411 |
|
429
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
412 |
# If the program is going to reindex, the port is irrelevant since |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
413 |
# the program will not bind to a port. |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
414 |
if not reindex: |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
415 |
available, msg = port_available(None, port) |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
416 |
if not available: |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
417 |
print "pkg.depotd: unable to bind to the specified " \ |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
418 |
"port: %d. Reason: %s" % (port, msg) |
6c9cbb6e6600
983 pkg search returns just one action per package/token-type combo
Brock Pytlik <bpytlik@sun.com>
parents:
428
diff
changeset
|
419 |
sys.exit(1) |
612
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
420 |
else: |
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
421 |
# Not applicable for reindexing operations. |
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
422 |
content_root = None |
386
5cd680466abe
2147 depot should check port instead of showing traceback if port binding fails
Shawn Walker <swalker@opensolaris.org>
parents:
382
diff
changeset
|
423 |
|
916
b05c5a1a600f
6905 pkg.depotd --refresh-index can't fork
Brock Pytlik <bpytlik@sun.com>
parents:
873
diff
changeset
|
424 |
fork_allowed = not reindex |
b05c5a1a600f
6905 pkg.depotd --refresh-index can't fork
Brock Pytlik <bpytlik@sun.com>
parents:
873
diff
changeset
|
425 |
|
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
426 |
scfg = config.SvrConfig(repo_path, content_root, AUTH_DEFAULT, |
916
b05c5a1a600f
6905 pkg.depotd --refresh-index can't fork
Brock Pytlik <bpytlik@sun.com>
parents:
873
diff
changeset
|
427 |
auto_create=not readonly, fork_allowed=fork_allowed) |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
428 |
|
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
429 |
if readonly: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
430 |
scfg.set_read_only() |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
431 |
|
461
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
432 |
if mirror: |
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
433 |
scfg.set_mirror() |
37cf3ac75e37
1018 actions with payloads should include all sizes and hashes
johansen <johansen@sun.com>
parents:
452
diff
changeset
|
434 |
|
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
435 |
try: |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
436 |
scfg.init_dirs() |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
437 |
except (config.SvrConfigError, EnvironmentError), _e: |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
438 |
print "pkg.depotd: an error occurred while trying to " \ |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
439 |
"initialize the depot repository directory " \ |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
440 |
"structures:\n%s" % _e |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
441 |
sys.exit(1) |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
442 |
|
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
443 |
key_data = None |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
444 |
if not reindex and ssl_cert_file and ssl_key_file and \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
445 |
ssl_dialog != "builtin": |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
446 |
cmdline = None |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
447 |
def get_ssl_passphrase(*ignored): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
448 |
p = None |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
449 |
try: |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
450 |
p = subprocess.Popen(cmdline, shell=True, |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
451 |
stdout=subprocess.PIPE, |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
452 |
stderr=None) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
453 |
p.wait() |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
454 |
except Exception, __e: |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
455 |
print "pkg.depotd: an error occurred while " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
456 |
"executing [%s]; unable to obtain the " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
457 |
"passphrase needed to decrypt the SSL" \ |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
458 |
"private key file: %s" % (cmdline, __e) |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
459 |
sys.exit(1) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
460 |
return p.stdout.read().strip("\n") |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
461 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
462 |
if ssl_dialog.startswith("exec:"): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
463 |
cmdline = "%s %s %d" % (ssl_dialog.split("exec:")[1], |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
464 |
"''", port) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
465 |
elif ssl_dialog.startswith("smf:"): |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
466 |
cmdline = "/usr/bin/svcprop -p " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
467 |
"pkg_secure/ssl_key_passphrase %s" % ( |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
468 |
ssl_dialog.split("smf:")[1]) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
469 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
470 |
# The key file requires decryption, but the user has requested |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
471 |
# exec-based authentication, so it will have to be decoded first |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
472 |
# to an un-named temporary file. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
473 |
try: |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
474 |
key_file = file(ssl_key_file, "rb") |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
475 |
pkey = crypto.load_privatekey(crypto.FILETYPE_PEM, |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
476 |
key_file.read(), get_ssl_passphrase) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
477 |
|
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
478 |
key_data = tempfile.TemporaryFile() |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
479 |
key_data.write(crypto.dump_privatekey( |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
480 |
crypto.FILETYPE_PEM, pkey)) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
481 |
key_data.seek(0) |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
482 |
except EnvironmentError, _e: |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
483 |
print "pkg.depotd: unable to read the SSL private " \ |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
484 |
"key file: %s" % _e |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
485 |
sys.exit(1) |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
486 |
except crypto.Error, _e: |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
487 |
print "pkg.depotd: authentication or cryptography " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
488 |
"failure while attempting to decode\nthe SSL " \ |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
489 |
"private key file: %s" % _e |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
490 |
sys.exit(1) |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
491 |
else: |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
492 |
# Redirect the server to the decrypted key file. |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
493 |
ssl_key_file = "/dev/fd/%d" % key_data.fileno() |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
494 |
|
452
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
495 |
# Setup our global configuration. |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
496 |
gconf = { |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
497 |
"checker.on": True, |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
498 |
"environment": "production", |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
499 |
"log.screen": False, |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
500 |
"server.shutdown_timeout": 0, |
452
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
501 |
"server.socket_host": "0.0.0.0", |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
502 |
"server.socket_port": port, |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
503 |
"server.socket_timeout": socket_timeout, |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
504 |
"server.ssl_certificate": ssl_cert_file, |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
505 |
"server.ssl_private_key": ssl_key_file, |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
506 |
"server.thread_pool": threads, |
742
909b912fa942
3011 new depot index page desired
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
689
diff
changeset
|
507 |
"tools.log_headers.on": True, |
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
508 |
"tools.encode.on": True |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
509 |
} |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
510 |
|
858
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
511 |
if debug_features["headers"]: |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
512 |
# Despite its name, this only logs headers when there is an |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
513 |
# error; it's redundant with the debug feature enabled. |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
514 |
gconf["tools.log_headers.on"] = False |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
515 |
|
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
516 |
# Causes the headers of every request to be logged to the error |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
517 |
# log; even if an exception occurs. |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
518 |
gconf["tools.log_headers_always.on"] = True |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
519 |
cherrypy.tools.log_headers_always = cherrypy.Tool( |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
520 |
"on_start_resource", |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
521 |
cherrypy.lib.cptools.log_request_headers) |
c8f3fcec3301
6245 intent information is not properly sent
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
817
diff
changeset
|
522 |
|
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
523 |
log_type_map = { |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
524 |
"errors": { |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
525 |
"param": "log.error_file", |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
526 |
"attr": "error_log" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
527 |
}, |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
528 |
"access": { |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
529 |
"param": "log.access_file", |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
530 |
"attr": "access_log" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
531 |
} |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
532 |
} |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
533 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
534 |
for log_type in log_type_map: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
535 |
dest = log_routes[log_type] |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
536 |
if dest in ("stdout", "stderr", "none"): |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
537 |
if dest == "none": |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
538 |
h = logging.StreamHandler(LogSink()) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
539 |
else: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
540 |
h = logging.StreamHandler(eval("sys.%s" % \ |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
541 |
dest)) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
542 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
543 |
h.setLevel(logging.DEBUG) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
544 |
h.setFormatter(cherrypy._cplogging.logfmt) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
545 |
log_obj = eval("cherrypy.log.%s" % \ |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
546 |
log_type_map[log_type]["attr"]) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
547 |
log_obj.addHandler(h) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
548 |
# Since we've replaced cherrypy's log handler with our |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
549 |
# own, we don't want the output directed to a file. |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
550 |
dest = "" |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
551 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
552 |
gconf[log_type_map[log_type]["param"]] = dest |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
553 |
|
612
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
554 |
cherrypy.config.update(gconf) |
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
555 |
|
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
556 |
# Now that our logging, etc. has been setup, it's safe to perform any |
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
557 |
# remaining preparation. |
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
558 |
if reindex: |
617
d146e7256c65
4048 A PartialIndexingException on the depot shouldn't stack trace or cause usage to be displayed
Brock Pytlik <bpytlik@sun.com>
parents:
612
diff
changeset
|
559 |
try: |
916
b05c5a1a600f
6905 pkg.depotd --refresh-index can't fork
Brock Pytlik <bpytlik@sun.com>
parents:
873
diff
changeset
|
560 |
scfg.acquire_catalog(rebuild=False, verbose=True) |
617
d146e7256c65
4048 A PartialIndexingException on the depot shouldn't stack trace or cause usage to be displayed
Brock Pytlik <bpytlik@sun.com>
parents:
612
diff
changeset
|
561 |
except search_errors.IndexingException, e: |
d146e7256c65
4048 A PartialIndexingException on the depot shouldn't stack trace or cause usage to be displayed
Brock Pytlik <bpytlik@sun.com>
parents:
612
diff
changeset
|
562 |
cherrypy.log(str(e), "INDEX") |
d146e7256c65
4048 A PartialIndexingException on the depot shouldn't stack trace or cause usage to be displayed
Brock Pytlik <bpytlik@sun.com>
parents:
612
diff
changeset
|
563 |
sys.exit(1) |
612
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
564 |
sys.exit(0) |
353fef98c569
4102 test suite fails if /usr/share/lib/pkg doesn't exist
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
589
diff
changeset
|
565 |
|
451
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
566 |
# Now build our site configuration. |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
567 |
conf = { |
452
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
568 |
"/": { |
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
569 |
# We have to override cherrypy's default response_class so that |
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
570 |
# we have access to the write() callable to stream data |
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
571 |
# directly to the client. |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
572 |
"wsgi.response_class": dr.DepotResponse, |
452
01f53c6381af
2714 image-update failure during update phase
Shawn Walker <shawn.walker@sun.com>
parents:
451
diff
changeset
|
573 |
}, |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
574 |
"/robots.txt": { |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
575 |
"tools.staticfile.on": True, |
742
909b912fa942
3011 new depot index page desired
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
689
diff
changeset
|
576 |
"tools.staticfile.filename": os.path.join(scfg.web_root, |
382
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
577 |
"robots.txt") |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
578 |
}, |
95304bd3b365
1854 rework depot to use higher-level framework
Shawn Walker <swalker@opensolaris.org>
parents:
374
diff
changeset
|
579 |
} |
145
08bee7fd13f6
Add versioning to the protocols
Danek Duvall <danek.duvall@sun.com>
parents:
135
diff
changeset
|
580 |
|
451
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
581 |
if proxy_base: |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
582 |
# This changes the base URL for our server, and is primarily |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
583 |
# intended to allow our depot process to operate behind Apache |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
584 |
# or some other webserver process. |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
585 |
# |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
586 |
# Visit the following URL for more information: |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
587 |
# http://cherrypy.org/wiki/BuiltinTools#tools.proxy |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
588 |
proxy_conf = { |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
589 |
"tools.proxy.on": True, |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
590 |
"tools.proxy.local": "", |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
591 |
"tools.proxy.base": proxy_base |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
592 |
} |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
593 |
|
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
594 |
# Now merge or add our proxy configuration information into the |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
595 |
# existing configuration. |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
596 |
for entry in proxy_conf: |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
597 |
conf["/"][entry] = proxy_conf[entry] |
74f1fe85fe2d
1324 RSS / Atom feeds of repository updates
Shawn Walker <shawn.walker@sun.com>
parents:
445
diff
changeset
|
598 |
|
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
599 |
scfg.acquire_in_flight() |
814
76909c2cad8f
5603 server catalog permissions should be 644, not 600
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
812
diff
changeset
|
600 |
try: |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
601 |
scfg.acquire_catalog(rebuild=rebuild, verbose=True) |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
602 |
except catalog.CatalogPermissionsException, _e: |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
603 |
emsg("pkg.depotd: %s" % _e) |
814
76909c2cad8f
5603 server catalog permissions should be 644, not 600
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
812
diff
changeset
|
604 |
sys.exit(1) |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
605 |
|
217
a53bcf30c049
279 catalog_update should cope with HTTPError
johansen <johansen@sun.com>
parents:
215
diff
changeset
|
606 |
try: |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
607 |
root = cherrypy.Application(depot.DepotHTTP(scfg, |
797
fddb78531f55
5211 cfg_cache needs to be able to live elsewhere
Brock Pytlik <bpytlik@sun.com>
parents:
791
diff
changeset
|
608 |
repo_config_file)) |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
609 |
except rc.InvalidAttributeValueError, _e: |
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
610 |
emsg("pkg.depotd: repository.conf error: %s" % _e) |
466
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
611 |
sys.exit(1) |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
612 |
|
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
613 |
try: |
7cfb6502ff1b
2333 control over access / error log destination desired
Shawn Walker <shawn.walker@sun.com>
parents:
461
diff
changeset
|
614 |
cherrypy.quickstart(root, config=conf) |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
615 |
except Exception, _e: |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
616 |
emsg("pkg.depotd: unknown error starting depot server, " \ |
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
617 |
"illegal option value specified?") |
873
b95d76c53b5e
2691 ability to publish packages to local disk repository
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
858
diff
changeset
|
618 |
emsg(_e) |
812
7e82ae7acf48
2154 pkg.depotd should offer SSL/HTTPS option
Shawn Walker <Shawn.Walker@Sun.COM>
parents:
797
diff
changeset
|
619 |
sys.exit(1) |