(PUP-11973) WIP

Author: tvpartytonight

src/clj/puppetlabs/puppetserver/ringutils.clj

@@ -75,6 +75,12 @@
       (handler req)
       {:status 403 :body "Forbidden."})))
 
+(defn wrap-with-certname-as-compiler
+  "Function that returns middleware that add X-Puppet-Compiler-Name to the response"
+  [handler name]
+  (fn [request]
+    (ring/header (handler request) "X-Puppet-Compiler-Name" name)))
+
 (defn wrap-with-puppet-version-header
   "Function that returns a middleware that adds an
   X-Puppet-Version header to the response."

src/clj/puppetlabs/services/master/master_core.clj

@@ -1313,14 +1313,16 @@
   wrap-middleware :- IFn
   [handler :- IFn
    authorization-fn :- IFn
-   puppet-version :- schema/Str]
+   puppet-version :- schema/Str
+   certname :- schema/Str]
   (-> handler
       authorization-fn
       (middleware/wrap-uncaught-errors :plain)
       middleware/wrap-request-logging
       i18n/locale-negotiator
       middleware/wrap-response-logging
-      (ringutils/wrap-with-puppet-version-header puppet-version)))
+      (ringutils/wrap-with-puppet-version-header puppet-version)
+      (ringutils/wrap-with-certname-as-compiler certname)))
 
 (schema/defn ^:always-validate get-master-route-config
   "Get the webserver route configuration for the master service"
@@ -1366,15 +1368,18 @@
    environment-class-cache-enabled :- schema/Bool
    boltlib-path :- (schema/maybe [schema/Str])
    bolt-builtin-content-dir :- (schema/maybe [schema/Str])
-   bolt-projects-dir :- (schema/maybe schema/Str)]
+   bolt-projects-dir :- (schema/maybe schema/Str)
+   certname :- schema/Str]
   (let [ruby-request-handler (wrap-middleware handle-request
                                               wrap-with-authorization-check
-                                              puppet-version)
+                                              puppet-version
+                                              certname)
         clojure-request-wrapper (fn [handler]
                                   (wrap-middleware
                                    (ring/wrap-params handler)
                                    wrap-with-authorization-check
-                                   puppet-version))]
+                                   puppet-version
+                                   certname))]
     (root-routes ruby-request-handler
                  clojure-request-wrapper
                  jruby-service

src/clj/puppetlabs/services/master/master_service.clj

@@ -149,7 +149,8 @@
                                                environment-class-cache-enabled
                                                boltlib-path
                                                bolt-builtin-content-dir
-                                               bolt-projects-dir))
+                                               bolt-projects-dir
+                                               certname))
          routes (comidi/context path ring-app)
          route-metadata (comidi/route-metadata routes)
          comidi-handler (comidi/routes->handler routes)