Merge pull request #183 from ChevronETC/jwts

switch from jsonwebtokens to jwts, allowing us to update json

Author: samtkaplan

Project.toml

@@ -1,7 +1,7 @@
 name = "AzManagers"
 uuid = "db05ebb0-6096-11e9-199b-87b703361841"
 authors = ["samtkaplan <[email protected]>"]
-version = "3.17.1"
+version = "3.17.2"
 
 [deps]
 AzSessions = "f239b30d-ae6b-58be-a2d5-7e9f30e280a9"
@@ -11,7 +11,7 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-JSONWebTokens = "9b8beb19-0777-58c6-920b-28f749fee4d3"
+JWTs = "d850fbd6-035d-5a70-a269-1ca2e636ac6c"
 LibCURL = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -26,19 +26,19 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [weakdeps]
 MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 
-[extras]
-MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
-
 [extensions]
 MPIExt = "MPI"
 
 [compat]
 AzSessions = "2"
 CodecZlib = "0.7"
 HTTP = "1"
-JSON = "0.21"
-JSONWebTokens = "1"
-LibCURL = "0.6"
+JSON = "0.21, 1"
+JWTs = "0.3"
+LibCURL = "0.6, 1"
 MPI = "0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20"
 TOML = "1"
 julia = "^1.4"
+
+[extras]
+MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"

src/AzManagers.jl

@@ -1,6 +1,6 @@
 module AzManagers
 
-using AzSessions, Base64, CodecZlib, Dates, Distributed, HTTP, JSON, JSONWebTokens, LibCURL, LibGit2, Logging, Pkg, Printf, Random, Serialization, Sockets, TOML
+using AzSessions, Base64, CodecZlib, Dates, Distributed, HTTP, JSON, JWTs, LibCURL, LibGit2, Logging, Pkg, Printf, Random, Serialization, Sockets, TOML
 
 function logerror(e, loglevel=Logging.Info)
     io = IOBuffer()
@@ -37,7 +37,7 @@ function write_manifest(;
     manifest = Dict("resourcegroup"=>resourcegroup, "subscriptionid"=>subscriptionid, "ssh_user"=>ssh_user, "ssh_private_key_file"=>ssh_private_key_file, "ssh_public_key_file"=>ssh_public_key_file)
     try
         isdir(manifestpath()) || mkdir(manifestpath(); mode=0o700)
-        write(manifestfile(), json(manifest, 1))
+        write(manifestfile(), JSON.json(manifest, 1))
         chmod(manifestfile(), 0o600)
     catch e
         @error "Failed to write manifest file, $(AzManagers.manifestfile())"
@@ -866,7 +866,7 @@ end
 function Distributed.addprocs(template::AbstractString, n::Int; kwargs...)
     isfile(templates_filename_scaleset()) || error("scale-set template file does not exist.  See `AzManagers.save_template_scaleset`")
 
-    templates_scaleset = JSON.parse(read(templates_filename_scaleset(), String))
+    templates_scaleset = JSON.parse(read(templates_filename_scaleset(), String); dicttype=Dict)
     haskey(templates_scaleset, template) || error("scale-set template file does not contain a template with name: $template. See `AzManagers.save_template_scaleset`")
 
     addprocs(templates_scaleset[template], n; kwargs...)
@@ -1313,7 +1313,7 @@ function azure_worker_init(cookie, master_address, master_port, ppi, exeflags, m
             "mpi_size" => mpi_size,
             "physical_hostname" => azure_physical_name()))
 
-    _vm = base64encode(json(vm))
+    _vm = base64encode(JSON.json(vm))
 
     nbytes_written = write(c, _vm*"\n")
     nbytes_written == length(_vm)+1 || error("wrote wrong number of bytes")
@@ -2235,7 +2235,7 @@ function resourcegraphrequest(manager, body)
             manager.verbose,
             "https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01",
             ["Authorization"=>"Bearer $(token(manager.session))", "Content-Type"=>"application/json"],
-            json(body)
+            JSON.json(body)
         )
         r = JSON.parse(String(_r.body))
         data = [data;get(r, "data", [])]
@@ -2345,7 +2345,7 @@ function scaleset_capacity!(manager::AzManager, subscriptionid, resourcegroup, s
         verbose,
         "https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachineScaleSets/$scalesetname?api-version=2023-03-01",
         ["Authorization"=>"Bearer $(token(manager.session))", "Content-Type"=>"application/json"],
-        json(Dict("sku"=>Dict("capacity"=>capacity))))
+        JSON.json(Dict("sku"=>Dict("capacity"=>capacity))))
 end
 
 function scaleset_create_or_update(manager::AzManager, user, subscriptionid, resourcegroup, scalesetname, sigimagename, sigimageversion,
@@ -2373,8 +2373,7 @@ function scaleset_create_or_update(manager::AzManager, user, subscriptionid, res
     _template["properties"]["virtualMachineProfile"]["storageProfile"]["osDisk"]["diskSizeGB"] = osdisksize
 
     _t = token(manager.session)
-    _e = JSONWebTokens.None()
-    _decoded = JSONWebTokens.decode(_e, _t)
+    _decoded = claims(JWT(;jwt=_t))
     if haskey(_decoded, "unique_name")
         _user = _decoded["unique_name"]
 
@@ -2469,7 +2468,7 @@ function scaleset_create_or_update(manager::AzManager, user, subscriptionid, res
         verbose,
         "https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachineScaleSets/$scalesetname?api-version=2023-03-01",
         ["Content-type"=>"application/json", "Authorization"=>"Bearer $(token(manager.session))"],
-        String(json(_template)))
+        String(JSON.json(_template)))
 
     if manager.show_quota
         @info "Quota after requesting that the scale-set is created or grows" remaining_resource(_r)
@@ -2485,7 +2484,7 @@ function delete_vms(manager::AzManager, subscriptionid, resourcegroup, scalesetn
         verbose,
         "https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachineScaleSets/$scalesetname/delete?forceDeletion=True&api-version=2023-07-01",
         ["Content-Type"=>"application/json", "Authorization"=>"Bearer $(token(manager.session))"],
-        json(body))
+        JSON.json(body))
 
     if manager.show_quota
         @info "Quota after requesting deletion of $(length(ids)) virtual machines" remaining_resource(_r)
@@ -2627,7 +2626,7 @@ function detachedrun(request::HTTP.Request)
         r = JSON.parse(String(HTTP.payload(request)))
 
         if !haskey(r, "code")
-            return HTTP.Response(400, ["Content-Type"=>"application/json"], json(Dict("error"=>"Malformed body: JSON body must contain the key: code")); request)
+            return HTTP.Response(400, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>"Malformed body: JSON body must contain the key: code")); request)
         end
 
         exename = get(r, "exename", "julia")
@@ -2652,7 +2651,7 @@ function detachedrun(request::HTTP.Request)
             end
         end
         if length(codelines) == 0
-            return HTTP.Response(400, ["Content-Type"=>"application/json"], json(Dict("error"=>"No code to execute, missing end?", "code"=>code)); request)
+            return HTTP.Response(400, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>"No code to execute, missing end?", "code"=>code)); request)
         end
 
         code = join(codelines, "\n")
@@ -2712,7 +2711,7 @@ function detachedrun(request::HTTP.Request)
     catch e
         io = IOBuffer()
         logerror(e, Logging.Warn)
-        return HTTP.Response(500, ["Content-Type"=>"application/json"], json(Dict("error"=>String(take!(io)))); request)
+        return HTTP.Response(500, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>String(take!(io)))); request)
     end
 
     Threads.@spawn begin
@@ -2725,7 +2724,7 @@ function detachedrun(request::HTTP.Request)
             rmproc(vm; session=sessionbundle(:management))
         end
     end
-    HTTP.Response(200, ["Content-Type"=>"application/json"], json(Dict("id"=>id, "pid"=>pid)); request)
+    HTTP.Response(200, ["Content-Type"=>"application/json"], JSON.json(Dict("id"=>id, "pid"=>pid)); request)
 end
 
 function detachedkill(request::HTTP.Request)
@@ -2778,9 +2777,9 @@ function detachedstatus(request::HTTP.Request)
             status = "starting"
         end
     catch e
-        return HTTP.Response(500, ["Content-Type"=>"application/json"], json(Dict("error"=>show(e), "trace"=>show(stacktrace()))); request)
+        return HTTP.Response(500, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>show(e), "trace"=>show(stacktrace()))); request)
     end
-    HTTP.Response(200, ["Content-Type"=>"application/json"], json(Dict("id"=>id, "status"=>status)); request)
+    HTTP.Response(200, ["Content-Type"=>"application/json"], JSON.json(Dict("id"=>id, "status"=>status)); request)
 end
 
 function detachedstdout(request::HTTP.Request)
@@ -2857,7 +2856,7 @@ function detachedwait(request::HTTP.Request)
         end
         write(io, "\n")
 
-        return HTTP.Response(400, ["Content-Type"=>"application/json"], json(Dict("error"=>String(take!(io)))); request)
+        return HTTP.Response(400, ["Content-Type"=>"application/json"], JSON.json(Dict("error"=>String(take!(io)))); request)
     end
     HTTP.Response(200, ["Content-Type"=>"application/text"], "OK, job $id is finished"; request)
 end
@@ -2867,7 +2866,7 @@ function detachedping(request::HTTP.Request)
 end
 
 function detachedvminfo(request::HTTP.Request)
-    HTTP.Response(200, ["Content-Type"=>"application/json"], json(AzManagers.DETACHED_VM[]); request)
+    HTTP.Response(200, ["Content-Type"=>"application/json"], JSON.json(AzManagers.DETACHED_VM[]); request)
 end
 
 #
@@ -2974,7 +2973,7 @@ function addproc(vm_template::Dict, nic_template=nothing;
         verbose,
         "https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Network/networkInterfaces/$nicname?api-version=2022-09-01",
         ["Content-Type"=>"application/json", "Authorization"=>"Bearer $(token(session))"],
-        String(json(nic_template)))
+        String(JSON.json(nic_template)))
 
     sleep(5)
 
@@ -3077,7 +3076,7 @@ function addproc(vm_template::Dict, nic_template=nothing;
         verbose,
         "https://management.azure.com/subscriptions/$subscriptionid/resourceGroups/$resourcegroup/providers/Microsoft.Compute/virtualMachines/$vmname?api-version=2023-09-01",
         ["Content-Type"=>"application/json", "Authorization"=>"Bearer $(token(session))"],
-        String(json(vm_template["value"])))
+        String(JSON.json(vm_template["value"])))
 
     spincount = 1
     starttime = tic = time()
@@ -3137,7 +3136,7 @@ end
 
 function addproc(vm_template::AbstractString, nic_template=nothing; kwargs...)
     isfile(templates_filename_vm()) || error("if vm_template is a string, then the file $(templates_filename_vm()) must exist.  See AzManagers.save_template_vm.")
-    vm_templates = JSON.parse(read(templates_filename_vm(), String))
+    vm_templates = JSON.parse(read(templates_filename_vm(), String); dicttype=Dict)
     vm_template = vm_templates[vm_template]
 
     addproc(vm_template, nic_template; kwargs...)
@@ -3398,7 +3397,7 @@ function detached_run(code, ip::String="", port=detached_port();
         "POST",
         "http://$(vm["ip"]):$(vm["port"])/cofii/detached/run",
         ["Content-Type"=>"application/json"],
-        json(body))
+        JSON.json(body))
     r = JSON.parse(String(_r.body))
 
     @info "detached job id is $(r["id"]) at $(vm["name"]),$(vm["ip"]):$(vm["port"])"

src/templates.jl

@@ -6,7 +6,7 @@ function save_template(templates_filename::AbstractString, name::AbstractString,
     if !ispath(templates_folder())
         mkdir(templates_folder())
     end
-    write(templates_filename, json(templates, 1))
+    write(templates_filename, JSON.json(templates, 1))
     nothing
 end