shopify-cli 1.5.0 → 1.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/PULL_REQUEST_TEMPLATE.md +1 -0
- data/.travis.yml +1 -0
- data/CHANGELOG.md +9 -0
- data/README.md +39 -7
- data/Rakefile +2 -0
- data/dev.yml +2 -2
- data/docs/_config.yml +1 -18
- data/docs/app/node/commands/index.md +2 -80
- data/docs/app/node/index.md +2 -33
- data/docs/app/rails/commands/index.md +2 -78
- data/docs/app/rails/index.md +2 -34
- data/docs/core/index.md +2 -84
- data/docs/getting-started/index.md +2 -25
- data/docs/getting-started/install/index.md +1 -118
- data/docs/getting-started/migrate/index.md +2 -94
- data/docs/getting-started/uninstall/index.md +2 -35
- data/docs/getting-started/upgrade/index.md +2 -39
- data/docs/help/start-app/index.md +2 -4
- data/docs/index.md +2 -24
- data/install.sh +1 -1
- data/lib/project_types/extension/cli.rb +19 -10
- data/lib/project_types/extension/commands/extension_command.rb +2 -2
- data/lib/project_types/extension/features/argo.rb +117 -0
- data/lib/project_types/extension/forms/create.rb +2 -2
- data/lib/project_types/extension/models/specification.rb +35 -0
- data/lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb +19 -0
- data/lib/project_types/extension/models/specification_handlers/default.rb +67 -0
- data/lib/project_types/extension/models/specifications.rb +77 -0
- data/lib/project_types/extension/tasks/configure_features.rb +52 -0
- data/lib/project_types/extension/tasks/fetch_specifications.rb +38 -0
- data/lib/project_types/node/commands/create.rb +3 -1
- data/lib/project_types/node/commands/generate.rb +2 -11
- data/lib/project_types/node/messages/messages.rb +9 -44
- data/lib/project_types/rails/commands/create.rb +8 -9
- data/lib/project_types/rails/forms/create.rb +1 -1
- data/lib/project_types/rails/gem.rb +1 -1
- data/lib/project_types/rails/messages/messages.rb +1 -1
- data/lib/project_types/script/cli.rb +7 -4
- data/lib/project_types/script/commands/create.rb +6 -4
- data/lib/project_types/script/commands/push.rb +5 -13
- data/lib/project_types/script/config/extension_points.yml +9 -5
- data/lib/project_types/script/errors.rb +17 -0
- data/lib/project_types/script/forms/create.rb +26 -2
- data/lib/project_types/script/graphql/app_script_update_or_create.graphql +10 -1
- data/lib/project_types/script/layers/application/build_script.rb +9 -4
- data/lib/project_types/script/layers/application/create_script.rb +12 -10
- data/lib/project_types/script/layers/application/extension_points.rb +24 -0
- data/lib/project_types/script/layers/application/push_script.rb +18 -16
- data/lib/project_types/script/layers/domain/errors.rb +4 -0
- data/lib/project_types/script/layers/domain/extension_point.rb +62 -6
- data/lib/project_types/script/layers/domain/metadata.rb +55 -0
- data/lib/project_types/script/layers/domain/push_package.rb +25 -6
- data/lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb +6 -6
- data/lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb +16 -6
- data/lib/project_types/script/layers/infrastructure/extension_point_repository.rb +10 -4
- data/lib/project_types/script/layers/infrastructure/project_creator.rb +2 -1
- data/lib/project_types/script/layers/infrastructure/push_package_repository.rb +25 -13
- data/lib/project_types/script/layers/infrastructure/rust_project_creator.rb +72 -0
- data/lib/project_types/script/layers/infrastructure/rust_task_runner.rb +59 -0
- data/lib/project_types/script/layers/infrastructure/script_service.rb +7 -1
- data/lib/project_types/script/layers/infrastructure/task_runner.rb +4 -3
- data/lib/project_types/script/messages/messages.rb +39 -8
- data/lib/project_types/script/script_project.rb +25 -16
- data/lib/project_types/script/ui/error_handler.rb +34 -1
- data/lib/project_types/theme/cli.rb +40 -0
- data/lib/project_types/theme/commands/connect.rb +54 -0
- data/lib/project_types/theme/commands/create.rb +48 -0
- data/lib/project_types/theme/commands/deploy.rb +38 -0
- data/lib/project_types/theme/commands/generate.rb +20 -0
- data/lib/project_types/theme/commands/generate/env.rb +79 -0
- data/lib/project_types/theme/commands/push.rb +55 -0
- data/lib/project_types/theme/commands/serve.rb +31 -0
- data/lib/project_types/theme/forms/connect.rb +34 -0
- data/lib/project_types/theme/forms/create.rb +22 -0
- data/lib/project_types/theme/messages/messages.rb +147 -0
- data/lib/project_types/theme/tasks/ensure_themekit_installed.rb +78 -0
- data/lib/project_types/theme/themekit.rb +113 -0
- data/lib/shopify-cli/admin_api.rb +42 -2
- data/lib/shopify-cli/api.rb +27 -24
- data/lib/shopify-cli/commands/system.rb +1 -1
- data/lib/shopify-cli/context.rb +23 -2
- data/lib/shopify-cli/feature.rb +0 -2
- data/lib/shopify-cli/http_request.rb +20 -8
- data/lib/shopify-cli/messages/messages.rb +6 -3
- data/lib/shopify-cli/method_object.rb +104 -0
- data/lib/shopify-cli/partners_api.rb +8 -2
- data/lib/shopify-cli/project_type.rb +1 -1
- data/lib/shopify-cli/resolve_constant.rb +25 -0
- data/lib/shopify-cli/result.rb +432 -0
- data/lib/shopify-cli/shopifolk.rb +3 -2
- data/lib/shopify-cli/tasks/select_org_and_shop.rb +6 -5
- data/lib/shopify-cli/tunnel.rb +7 -1
- data/lib/shopify-cli/version.rb +1 -1
- data/lib/shopify_cli.rb +4 -1
- data/shopify.fish +1 -1
- data/shopify.sh +1 -1
- data/vendor/deps/cli-kit/REVISION +1 -1
- data/vendor/deps/cli-kit/lib/cli/kit/logger.rb +2 -2
- data/vendor/deps/cli-kit/lib/cli/kit/system.rb +3 -3
- data/vendor/deps/cli-ui/REVISION +1 -1
- data/vendor/deps/cli-ui/lib/cli/ui.rb +26 -22
- data/vendor/deps/cli-ui/lib/cli/ui/ansi.rb +4 -6
- data/vendor/deps/cli-ui/lib/cli/ui/frame.rb +3 -3
- data/vendor/deps/cli-ui/lib/cli/ui/frame/frame_stack.rb +8 -9
- data/vendor/deps/cli-ui/lib/cli/ui/frame/frame_style.rb +1 -1
- data/vendor/deps/cli-ui/lib/cli/ui/glyph.rb +1 -0
- data/vendor/deps/cli-ui/lib/cli/ui/printer.rb +15 -3
- data/vendor/deps/cli-ui/lib/cli/ui/prompt/interactive_options.rb +4 -11
- data/vendor/deps/cli-ui/lib/cli/ui/spinner.rb +3 -5
- data/vendor/deps/cli-ui/lib/cli/ui/terminal.rb +10 -10
- data/vendor/deps/cli-ui/lib/cli/ui/version.rb +1 -1
- data/vendor/deps/cli-ui/lib/cli/ui/wrap.rb +56 -0
- data/vendor/deps/webrick/.gitignore +9 -0
- data/vendor/deps/webrick/Gemfile +3 -0
- data/vendor/deps/webrick/LICENSE.txt +22 -0
- data/vendor/deps/webrick/README.md +61 -0
- data/vendor/deps/webrick/Rakefile +10 -0
- data/vendor/deps/webrick/lib/webrick.rb +232 -0
- data/vendor/deps/webrick/lib/webrick/accesslog.rb +157 -0
- data/vendor/deps/webrick/lib/webrick/cgi.rb +313 -0
- data/vendor/deps/webrick/lib/webrick/compat.rb +36 -0
- data/vendor/deps/webrick/lib/webrick/config.rb +158 -0
- data/vendor/deps/webrick/lib/webrick/cookie.rb +172 -0
- data/vendor/deps/webrick/lib/webrick/htmlutils.rb +30 -0
- data/vendor/deps/webrick/lib/webrick/httpauth.rb +96 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/authenticator.rb +117 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/basicauth.rb +116 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/digestauth.rb +395 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/htdigest.rb +132 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/htgroup.rb +97 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/htpasswd.rb +158 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/userdb.rb +53 -0
- data/vendor/deps/webrick/lib/webrick/httpproxy.rb +354 -0
- data/vendor/deps/webrick/lib/webrick/httprequest.rb +636 -0
- data/vendor/deps/webrick/lib/webrick/httpresponse.rb +564 -0
- data/vendor/deps/webrick/lib/webrick/https.rb +152 -0
- data/vendor/deps/webrick/lib/webrick/httpserver.rb +294 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet.rb +23 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/abstract.rb +152 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/cgi_runner.rb +47 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/cgihandler.rb +126 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/erbhandler.rb +88 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/filehandler.rb +552 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/prochandler.rb +47 -0
- data/vendor/deps/webrick/lib/webrick/httpstatus.rb +194 -0
- data/vendor/deps/webrick/lib/webrick/httputils.rb +512 -0
- data/vendor/deps/webrick/lib/webrick/httpversion.rb +76 -0
- data/vendor/deps/webrick/lib/webrick/log.rb +156 -0
- data/vendor/deps/webrick/lib/webrick/server.rb +381 -0
- data/vendor/deps/webrick/lib/webrick/ssl.rb +215 -0
- data/vendor/deps/webrick/lib/webrick/utils.rb +265 -0
- data/vendor/deps/webrick/lib/webrick/version.rb +18 -0
- data/vendor/deps/webrick/webrick.gemspec +74 -0
- metadata +70 -26
- data/docs/Gemfile +0 -5
- data/docs/Gemfile.lock +0 -258
- data/docs/_data/nav.yml +0 -35
- data/docs/_includes/footer.html +0 -15
- data/docs/_includes/head.html +0 -19
- data/docs/_includes/sidebar_nav.html +0 -22
- data/docs/_includes/toc.html +0 -112
- data/docs/_layouts/default.html +0 -79
- data/docs/css/docs.css +0 -157
- data/docs/images/header.png +0 -0
- data/docs/installing-ruby.md +0 -28
- data/lib/project_types/extension/features/argo/admin.rb +0 -20
- data/lib/project_types/extension/features/argo/base.rb +0 -129
- data/lib/project_types/extension/features/argo/checkout.rb +0 -20
- data/lib/project_types/extension/models/type.rb +0 -81
- data/lib/project_types/extension/models/types/checkout_post_purchase.rb +0 -23
- data/lib/project_types/extension/models/types/product_subscription.rb +0 -24
- data/lib/project_types/node/commands/generate/billing.rb +0 -39
- data/lib/project_types/node/commands/generate/page.rb +0 -59
- data/lib/project_types/node/commands/generate/webhook.rb +0 -37
- data/lib/project_types/script/layers/domain/script.rb +0 -18
- data/lib/project_types/script/layers/infrastructure/script_repository.rb +0 -47
- data/lib/project_types/script/templates/ts/as-pect.config.js +0 -27
- data/lib/project_types/script/templates/ts/as-pect.d.ts +0 -1
@@ -0,0 +1,395 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
#
|
3
|
+
# httpauth/digestauth.rb -- HTTP digest access authentication
|
4
|
+
#
|
5
|
+
# Author: IPR -- Internet Programming with Ruby -- writers
|
6
|
+
# Copyright (c) 2003 Internet Programming with Ruby writers.
|
7
|
+
# Copyright (c) 2003 H.M.
|
8
|
+
#
|
9
|
+
# The original implementation is provided by H.M.
|
10
|
+
# URL: http://rwiki.jin.gr.jp/cgi-bin/rw-cgi.rb?cmd=view;name=
|
11
|
+
# %C7%A7%BE%DA%B5%A1%C7%BD%A4%F2%B2%FE%C2%A4%A4%B7%A4%C6%A4%DF%A4%EB
|
12
|
+
#
|
13
|
+
# $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
|
14
|
+
|
15
|
+
require_relative '../config'
|
16
|
+
require_relative '../httpstatus'
|
17
|
+
require_relative 'authenticator'
|
18
|
+
require 'digest/md5'
|
19
|
+
require 'digest/sha1'
|
20
|
+
|
21
|
+
module WEBrick
|
22
|
+
module HTTPAuth
|
23
|
+
|
24
|
+
##
|
25
|
+
# RFC 2617 Digest Access Authentication for WEBrick
|
26
|
+
#
|
27
|
+
# Use this class to add digest authentication to a WEBrick servlet.
|
28
|
+
#
|
29
|
+
# Here is an example of how to set up DigestAuth:
|
30
|
+
#
|
31
|
+
# config = { :Realm => 'DigestAuth example realm' }
|
32
|
+
#
|
33
|
+
# htdigest = WEBrick::HTTPAuth::Htdigest.new 'my_password_file'
|
34
|
+
# htdigest.set_passwd config[:Realm], 'username', 'password'
|
35
|
+
# htdigest.flush
|
36
|
+
#
|
37
|
+
# config[:UserDB] = htdigest
|
38
|
+
#
|
39
|
+
# digest_auth = WEBrick::HTTPAuth::DigestAuth.new config
|
40
|
+
#
|
41
|
+
# When using this as with a servlet be sure not to create a new DigestAuth
|
42
|
+
# object in the servlet's #initialize. By default WEBrick creates a new
|
43
|
+
# servlet instance for every request and the DigestAuth object must be
|
44
|
+
# used across requests.
|
45
|
+
|
46
|
+
class DigestAuth
|
47
|
+
include Authenticator
|
48
|
+
|
49
|
+
AuthScheme = "Digest" # :nodoc:
|
50
|
+
|
51
|
+
##
|
52
|
+
# Struct containing the opaque portion of the digest authentication
|
53
|
+
|
54
|
+
OpaqueInfo = Struct.new(:time, :nonce, :nc) # :nodoc:
|
55
|
+
|
56
|
+
##
|
57
|
+
# Digest authentication algorithm
|
58
|
+
|
59
|
+
attr_reader :algorithm
|
60
|
+
|
61
|
+
##
|
62
|
+
# Quality of protection. RFC 2617 defines "auth" and "auth-int"
|
63
|
+
|
64
|
+
attr_reader :qop
|
65
|
+
|
66
|
+
##
|
67
|
+
# Used by UserDB to create a digest password entry
|
68
|
+
|
69
|
+
def self.make_passwd(realm, user, pass)
|
70
|
+
pass ||= ""
|
71
|
+
Digest::MD5::hexdigest([user, realm, pass].join(":"))
|
72
|
+
end
|
73
|
+
|
74
|
+
##
|
75
|
+
# Creates a new DigestAuth instance. Be sure to use the same DigestAuth
|
76
|
+
# instance for multiple requests as it saves state between requests in
|
77
|
+
# order to perform authentication.
|
78
|
+
#
|
79
|
+
# See WEBrick::Config::DigestAuth for default configuration entries
|
80
|
+
#
|
81
|
+
# You must supply the following configuration entries:
|
82
|
+
#
|
83
|
+
# :Realm:: The name of the realm being protected.
|
84
|
+
# :UserDB:: A database of usernames and passwords.
|
85
|
+
# A WEBrick::HTTPAuth::Htdigest instance should be used.
|
86
|
+
|
87
|
+
def initialize(config, default=Config::DigestAuth)
|
88
|
+
check_init(config)
|
89
|
+
@config = default.dup.update(config)
|
90
|
+
@algorithm = @config[:Algorithm]
|
91
|
+
@domain = @config[:Domain]
|
92
|
+
@qop = @config[:Qop]
|
93
|
+
@use_opaque = @config[:UseOpaque]
|
94
|
+
@use_next_nonce = @config[:UseNextNonce]
|
95
|
+
@check_nc = @config[:CheckNc]
|
96
|
+
@use_auth_info_header = @config[:UseAuthenticationInfoHeader]
|
97
|
+
@nonce_expire_period = @config[:NonceExpirePeriod]
|
98
|
+
@nonce_expire_delta = @config[:NonceExpireDelta]
|
99
|
+
@internet_explorer_hack = @config[:InternetExplorerHack]
|
100
|
+
|
101
|
+
case @algorithm
|
102
|
+
when 'MD5','MD5-sess'
|
103
|
+
@h = Digest::MD5
|
104
|
+
when 'SHA1','SHA1-sess' # it is a bonus feature :-)
|
105
|
+
@h = Digest::SHA1
|
106
|
+
else
|
107
|
+
msg = format('Algorithm "%s" is not supported.', @algorithm)
|
108
|
+
raise ArgumentError.new(msg)
|
109
|
+
end
|
110
|
+
|
111
|
+
@instance_key = hexdigest(self.__id__, Time.now.to_i, Process.pid)
|
112
|
+
@opaques = {}
|
113
|
+
@last_nonce_expire = Time.now
|
114
|
+
@mutex = Thread::Mutex.new
|
115
|
+
end
|
116
|
+
|
117
|
+
##
|
118
|
+
# Authenticates a +req+ and returns a 401 Unauthorized using +res+ if
|
119
|
+
# the authentication was not correct.
|
120
|
+
|
121
|
+
def authenticate(req, res)
|
122
|
+
unless result = @mutex.synchronize{ _authenticate(req, res) }
|
123
|
+
challenge(req, res)
|
124
|
+
end
|
125
|
+
if result == :nonce_is_stale
|
126
|
+
challenge(req, res, true)
|
127
|
+
end
|
128
|
+
return true
|
129
|
+
end
|
130
|
+
|
131
|
+
##
|
132
|
+
# Returns a challenge response which asks for authentication information
|
133
|
+
|
134
|
+
def challenge(req, res, stale=false)
|
135
|
+
nonce = generate_next_nonce(req)
|
136
|
+
if @use_opaque
|
137
|
+
opaque = generate_opaque(req)
|
138
|
+
@opaques[opaque].nonce = nonce
|
139
|
+
end
|
140
|
+
|
141
|
+
param = Hash.new
|
142
|
+
param["realm"] = HTTPUtils::quote(@realm)
|
143
|
+
param["domain"] = HTTPUtils::quote(@domain.to_a.join(" ")) if @domain
|
144
|
+
param["nonce"] = HTTPUtils::quote(nonce)
|
145
|
+
param["opaque"] = HTTPUtils::quote(opaque) if opaque
|
146
|
+
param["stale"] = stale.to_s
|
147
|
+
param["algorithm"] = @algorithm
|
148
|
+
param["qop"] = HTTPUtils::quote(@qop.to_a.join(",")) if @qop
|
149
|
+
|
150
|
+
res[@response_field] =
|
151
|
+
"#{@auth_scheme} " + param.map{|k,v| "#{k}=#{v}" }.join(", ")
|
152
|
+
info("%s: %s", @response_field, res[@response_field]) if $DEBUG
|
153
|
+
raise @auth_exception
|
154
|
+
end
|
155
|
+
|
156
|
+
private
|
157
|
+
|
158
|
+
# :stopdoc:
|
159
|
+
|
160
|
+
MustParams = ['username','realm','nonce','uri','response']
|
161
|
+
MustParamsAuth = ['cnonce','nc']
|
162
|
+
|
163
|
+
def _authenticate(req, res)
|
164
|
+
unless digest_credentials = check_scheme(req)
|
165
|
+
return false
|
166
|
+
end
|
167
|
+
|
168
|
+
auth_req = split_param_value(digest_credentials)
|
169
|
+
if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
|
170
|
+
req_params = MustParams + MustParamsAuth
|
171
|
+
else
|
172
|
+
req_params = MustParams
|
173
|
+
end
|
174
|
+
req_params.each{|key|
|
175
|
+
unless auth_req.has_key?(key)
|
176
|
+
error('%s: parameter missing. "%s"', auth_req['username'], key)
|
177
|
+
raise HTTPStatus::BadRequest
|
178
|
+
end
|
179
|
+
}
|
180
|
+
|
181
|
+
if !check_uri(req, auth_req)
|
182
|
+
raise HTTPStatus::BadRequest
|
183
|
+
end
|
184
|
+
|
185
|
+
if auth_req['realm'] != @realm
|
186
|
+
error('%s: realm unmatch. "%s" for "%s"',
|
187
|
+
auth_req['username'], auth_req['realm'], @realm)
|
188
|
+
return false
|
189
|
+
end
|
190
|
+
|
191
|
+
auth_req['algorithm'] ||= 'MD5'
|
192
|
+
if auth_req['algorithm'].upcase != @algorithm.upcase
|
193
|
+
error('%s: algorithm unmatch. "%s" for "%s"',
|
194
|
+
auth_req['username'], auth_req['algorithm'], @algorithm)
|
195
|
+
return false
|
196
|
+
end
|
197
|
+
|
198
|
+
if (@qop.nil? && auth_req.has_key?('qop')) ||
|
199
|
+
(@qop && (! @qop.member?(auth_req['qop'])))
|
200
|
+
error('%s: the qop is not allowed. "%s"',
|
201
|
+
auth_req['username'], auth_req['qop'])
|
202
|
+
return false
|
203
|
+
end
|
204
|
+
|
205
|
+
password = @userdb.get_passwd(@realm, auth_req['username'], @reload_db)
|
206
|
+
unless password
|
207
|
+
error('%s: the user is not allowed.', auth_req['username'])
|
208
|
+
return false
|
209
|
+
end
|
210
|
+
|
211
|
+
nonce_is_invalid = false
|
212
|
+
if @use_opaque
|
213
|
+
info("@opaque = %s", @opaque.inspect) if $DEBUG
|
214
|
+
if !(opaque = auth_req['opaque'])
|
215
|
+
error('%s: opaque is not given.', auth_req['username'])
|
216
|
+
nonce_is_invalid = true
|
217
|
+
elsif !(opaque_struct = @opaques[opaque])
|
218
|
+
error('%s: invalid opaque is given.', auth_req['username'])
|
219
|
+
nonce_is_invalid = true
|
220
|
+
elsif !check_opaque(opaque_struct, req, auth_req)
|
221
|
+
@opaques.delete(auth_req['opaque'])
|
222
|
+
nonce_is_invalid = true
|
223
|
+
end
|
224
|
+
elsif !check_nonce(req, auth_req)
|
225
|
+
nonce_is_invalid = true
|
226
|
+
end
|
227
|
+
|
228
|
+
if /-sess$/i =~ auth_req['algorithm']
|
229
|
+
ha1 = hexdigest(password, auth_req['nonce'], auth_req['cnonce'])
|
230
|
+
else
|
231
|
+
ha1 = password
|
232
|
+
end
|
233
|
+
|
234
|
+
if auth_req['qop'] == "auth" || auth_req['qop'] == nil
|
235
|
+
ha2 = hexdigest(req.request_method, auth_req['uri'])
|
236
|
+
ha2_res = hexdigest("", auth_req['uri'])
|
237
|
+
elsif auth_req['qop'] == "auth-int"
|
238
|
+
body_digest = @h.new
|
239
|
+
req.body { |chunk| body_digest.update(chunk) }
|
240
|
+
body_digest = body_digest.hexdigest
|
241
|
+
ha2 = hexdigest(req.request_method, auth_req['uri'], body_digest)
|
242
|
+
ha2_res = hexdigest("", auth_req['uri'], body_digest)
|
243
|
+
end
|
244
|
+
|
245
|
+
if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
|
246
|
+
param2 = ['nonce', 'nc', 'cnonce', 'qop'].map{|key|
|
247
|
+
auth_req[key]
|
248
|
+
}.join(':')
|
249
|
+
digest = hexdigest(ha1, param2, ha2)
|
250
|
+
digest_res = hexdigest(ha1, param2, ha2_res)
|
251
|
+
else
|
252
|
+
digest = hexdigest(ha1, auth_req['nonce'], ha2)
|
253
|
+
digest_res = hexdigest(ha1, auth_req['nonce'], ha2_res)
|
254
|
+
end
|
255
|
+
|
256
|
+
if digest != auth_req['response']
|
257
|
+
error("%s: digest unmatch.", auth_req['username'])
|
258
|
+
return false
|
259
|
+
elsif nonce_is_invalid
|
260
|
+
error('%s: digest is valid, but nonce is not valid.',
|
261
|
+
auth_req['username'])
|
262
|
+
return :nonce_is_stale
|
263
|
+
elsif @use_auth_info_header
|
264
|
+
auth_info = {
|
265
|
+
'nextnonce' => generate_next_nonce(req),
|
266
|
+
'rspauth' => digest_res
|
267
|
+
}
|
268
|
+
if @use_opaque
|
269
|
+
opaque_struct.time = req.request_time
|
270
|
+
opaque_struct.nonce = auth_info['nextnonce']
|
271
|
+
opaque_struct.nc = "%08x" % (auth_req['nc'].hex + 1)
|
272
|
+
end
|
273
|
+
if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
|
274
|
+
['qop','cnonce','nc'].each{|key|
|
275
|
+
auth_info[key] = auth_req[key]
|
276
|
+
}
|
277
|
+
end
|
278
|
+
res[@resp_info_field] = auth_info.keys.map{|key|
|
279
|
+
if key == 'nc'
|
280
|
+
key + '=' + auth_info[key]
|
281
|
+
else
|
282
|
+
key + "=" + HTTPUtils::quote(auth_info[key])
|
283
|
+
end
|
284
|
+
}.join(', ')
|
285
|
+
end
|
286
|
+
info('%s: authentication succeeded.', auth_req['username'])
|
287
|
+
req.user = auth_req['username']
|
288
|
+
return true
|
289
|
+
end
|
290
|
+
|
291
|
+
def split_param_value(string)
|
292
|
+
ret = {}
|
293
|
+
string.scan(/\G\s*([\w\-.*%!]+)=\s*(?:\"((?>\\.|[^\"])*)\"|([^,\"]*))\s*,?/) do
|
294
|
+
ret[$1] = $3 || $2.gsub(/\\(.)/, "\\1")
|
295
|
+
end
|
296
|
+
ret
|
297
|
+
end
|
298
|
+
|
299
|
+
def generate_next_nonce(req)
|
300
|
+
now = "%012d" % req.request_time.to_i
|
301
|
+
pk = hexdigest(now, @instance_key)[0,32]
|
302
|
+
nonce = [now + ":" + pk].pack("m0") # it has 60 length of chars.
|
303
|
+
nonce
|
304
|
+
end
|
305
|
+
|
306
|
+
def check_nonce(req, auth_req)
|
307
|
+
username = auth_req['username']
|
308
|
+
nonce = auth_req['nonce']
|
309
|
+
|
310
|
+
pub_time, pk = nonce.unpack("m*")[0].split(":", 2)
|
311
|
+
if (!pub_time || !pk)
|
312
|
+
error("%s: empty nonce is given", username)
|
313
|
+
return false
|
314
|
+
elsif (hexdigest(pub_time, @instance_key)[0,32] != pk)
|
315
|
+
error("%s: invalid private-key: %s for %s",
|
316
|
+
username, hexdigest(pub_time, @instance_key)[0,32], pk)
|
317
|
+
return false
|
318
|
+
end
|
319
|
+
|
320
|
+
diff_time = req.request_time.to_i - pub_time.to_i
|
321
|
+
if (diff_time < 0)
|
322
|
+
error("%s: difference of time-stamp is negative.", username)
|
323
|
+
return false
|
324
|
+
elsif diff_time > @nonce_expire_period
|
325
|
+
error("%s: nonce is expired.", username)
|
326
|
+
return false
|
327
|
+
end
|
328
|
+
|
329
|
+
return true
|
330
|
+
end
|
331
|
+
|
332
|
+
def generate_opaque(req)
|
333
|
+
@mutex.synchronize{
|
334
|
+
now = req.request_time
|
335
|
+
if now - @last_nonce_expire > @nonce_expire_delta
|
336
|
+
@opaques.delete_if{|key,val|
|
337
|
+
(now - val.time) > @nonce_expire_period
|
338
|
+
}
|
339
|
+
@last_nonce_expire = now
|
340
|
+
end
|
341
|
+
begin
|
342
|
+
opaque = Utils::random_string(16)
|
343
|
+
end while @opaques[opaque]
|
344
|
+
@opaques[opaque] = OpaqueInfo.new(now, nil, '00000001')
|
345
|
+
opaque
|
346
|
+
}
|
347
|
+
end
|
348
|
+
|
349
|
+
def check_opaque(opaque_struct, req, auth_req)
|
350
|
+
if (@use_next_nonce && auth_req['nonce'] != opaque_struct.nonce)
|
351
|
+
error('%s: nonce unmatched. "%s" for "%s"',
|
352
|
+
auth_req['username'], auth_req['nonce'], opaque_struct.nonce)
|
353
|
+
return false
|
354
|
+
elsif !check_nonce(req, auth_req)
|
355
|
+
return false
|
356
|
+
end
|
357
|
+
if (@check_nc && auth_req['nc'] != opaque_struct.nc)
|
358
|
+
error('%s: nc unmatched."%s" for "%s"',
|
359
|
+
auth_req['username'], auth_req['nc'], opaque_struct.nc)
|
360
|
+
return false
|
361
|
+
end
|
362
|
+
true
|
363
|
+
end
|
364
|
+
|
365
|
+
def check_uri(req, auth_req)
|
366
|
+
uri = auth_req['uri']
|
367
|
+
if uri != req.request_uri.to_s && uri != req.unparsed_uri &&
|
368
|
+
(@internet_explorer_hack && uri != req.path)
|
369
|
+
error('%s: uri unmatch. "%s" for "%s"', auth_req['username'],
|
370
|
+
auth_req['uri'], req.request_uri.to_s)
|
371
|
+
return false
|
372
|
+
end
|
373
|
+
true
|
374
|
+
end
|
375
|
+
|
376
|
+
def hexdigest(*args)
|
377
|
+
@h.hexdigest(args.join(":"))
|
378
|
+
end
|
379
|
+
|
380
|
+
# :startdoc:
|
381
|
+
end
|
382
|
+
|
383
|
+
##
|
384
|
+
# Digest authentication for proxy servers. See DigestAuth for details.
|
385
|
+
|
386
|
+
class ProxyDigestAuth < DigestAuth
|
387
|
+
include ProxyAuthenticator
|
388
|
+
|
389
|
+
private
|
390
|
+
def check_uri(req, auth_req) # :nodoc:
|
391
|
+
return true
|
392
|
+
end
|
393
|
+
end
|
394
|
+
end
|
395
|
+
end
|
@@ -0,0 +1,132 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
#
|
3
|
+
# httpauth/htdigest.rb -- Apache compatible htdigest file
|
4
|
+
#
|
5
|
+
# Author: IPR -- Internet Programming with Ruby -- writers
|
6
|
+
# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
|
7
|
+
# reserved.
|
8
|
+
#
|
9
|
+
# $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
|
10
|
+
|
11
|
+
require_relative 'userdb'
|
12
|
+
require_relative 'digestauth'
|
13
|
+
require 'tempfile'
|
14
|
+
|
15
|
+
module WEBrick
|
16
|
+
module HTTPAuth
|
17
|
+
|
18
|
+
##
|
19
|
+
# Htdigest accesses apache-compatible digest password files. Passwords are
|
20
|
+
# matched to a realm where they are valid. For security, the path for a
|
21
|
+
# digest password database should be stored outside of the paths available
|
22
|
+
# to the HTTP server.
|
23
|
+
#
|
24
|
+
# Htdigest is intended for use with WEBrick::HTTPAuth::DigestAuth and
|
25
|
+
# stores passwords using cryptographic hashes.
|
26
|
+
#
|
27
|
+
# htpasswd = WEBrick::HTTPAuth::Htdigest.new 'my_password_file'
|
28
|
+
# htpasswd.set_passwd 'my realm', 'username', 'password'
|
29
|
+
# htpasswd.flush
|
30
|
+
|
31
|
+
class Htdigest
|
32
|
+
include UserDB
|
33
|
+
|
34
|
+
##
|
35
|
+
# Open a digest password database at +path+
|
36
|
+
|
37
|
+
def initialize(path)
|
38
|
+
@path = path
|
39
|
+
@mtime = Time.at(0)
|
40
|
+
@digest = Hash.new
|
41
|
+
@mutex = Thread::Mutex::new
|
42
|
+
@auth_type = DigestAuth
|
43
|
+
File.open(@path,"a").close unless File.exist?(@path)
|
44
|
+
reload
|
45
|
+
end
|
46
|
+
|
47
|
+
##
|
48
|
+
# Reloads passwords from the database
|
49
|
+
|
50
|
+
def reload
|
51
|
+
mtime = File::mtime(@path)
|
52
|
+
if mtime > @mtime
|
53
|
+
@digest.clear
|
54
|
+
File.open(@path){|io|
|
55
|
+
while line = io.gets
|
56
|
+
line.chomp!
|
57
|
+
user, realm, pass = line.split(/:/, 3)
|
58
|
+
unless @digest[realm]
|
59
|
+
@digest[realm] = Hash.new
|
60
|
+
end
|
61
|
+
@digest[realm][user] = pass
|
62
|
+
end
|
63
|
+
}
|
64
|
+
@mtime = mtime
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
##
|
69
|
+
# Flush the password database. If +output+ is given the database will
|
70
|
+
# be written there instead of to the original path.
|
71
|
+
|
72
|
+
def flush(output=nil)
|
73
|
+
output ||= @path
|
74
|
+
tmp = Tempfile.create("htpasswd", File::dirname(output))
|
75
|
+
renamed = false
|
76
|
+
begin
|
77
|
+
each{|item| tmp.puts(item.join(":")) }
|
78
|
+
tmp.close
|
79
|
+
File::rename(tmp.path, output)
|
80
|
+
renamed = true
|
81
|
+
ensure
|
82
|
+
tmp.close
|
83
|
+
File.unlink(tmp.path) if !renamed
|
84
|
+
end
|
85
|
+
end
|
86
|
+
|
87
|
+
##
|
88
|
+
# Retrieves a password from the database for +user+ in +realm+. If
|
89
|
+
# +reload_db+ is true the database will be reloaded first.
|
90
|
+
|
91
|
+
def get_passwd(realm, user, reload_db)
|
92
|
+
reload() if reload_db
|
93
|
+
if hash = @digest[realm]
|
94
|
+
hash[user]
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
##
|
99
|
+
# Sets a password in the database for +user+ in +realm+ to +pass+.
|
100
|
+
|
101
|
+
def set_passwd(realm, user, pass)
|
102
|
+
@mutex.synchronize{
|
103
|
+
unless @digest[realm]
|
104
|
+
@digest[realm] = Hash.new
|
105
|
+
end
|
106
|
+
@digest[realm][user] = make_passwd(realm, user, pass)
|
107
|
+
}
|
108
|
+
end
|
109
|
+
|
110
|
+
##
|
111
|
+
# Removes a password from the database for +user+ in +realm+.
|
112
|
+
|
113
|
+
def delete_passwd(realm, user)
|
114
|
+
if hash = @digest[realm]
|
115
|
+
hash.delete(user)
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
119
|
+
##
|
120
|
+
# Iterate passwords in the database.
|
121
|
+
|
122
|
+
def each # :yields: [user, realm, password_hash]
|
123
|
+
@digest.keys.sort.each{|realm|
|
124
|
+
hash = @digest[realm]
|
125
|
+
hash.keys.sort.each{|user|
|
126
|
+
yield([user, realm, hash[user]])
|
127
|
+
}
|
128
|
+
}
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end
|
132
|
+
end
|