move originAgentCluster to content

Author: nichtsam

src/content.ts

@@ -10,6 +10,7 @@ import {
   type CrossOriginOpenerPolicyOptions,
   crossOriginOpenerPolicy,
 } from "./rules/content/cross-origin-opener-policy.js";
+import { originAgentCluster } from "./rules/content/origin-agent-cluster.js";
 import { xDownloadOptions } from "./rules/content/x-download-options.js";
 import {
   type XFrameOptionsOptions,
@@ -27,6 +28,10 @@ export function contentSecurity(
   headers: Headers,
   options: ContentSecureOptions = {},
 ) {
+  if (options.originAgentCluster ?? true) {
+    originAgentCluster(headers);
+  }
+
   if (options.xXssProtection ?? true) {
     xXssProtection(headers);
   }
@@ -81,6 +86,7 @@ export function contentSecurity(
 }
 
 export type ContentSecureOptions = {
+  originAgentCluster?: boolean;
   contentSecurityPolicy?: ContentSecurityPolicyOptions | boolean;
   crossOriginOpenerPolicy?: CrossOriginOpenerPolicyOptions | boolean;
   crossOriginEmbedderPolicy?: CrossOriginEmbedderPolicyOptions | boolean;

src/general.ts

@@ -1,5 +1,4 @@
 import { resourceSharingSecurity } from "./resourceSharing.js";
-import { originAgentCluster } from "./rules/general/origin-agent-cluster.js";
 import {
   type ReferrerPolicyOptions,
   referrerPolicy,
@@ -29,10 +28,6 @@ export function generalSecurity(
     resourceSharingSecurity(headers, { strategy: "same-origin" });
   }
 
-  if (options.originAgentCluster ?? true) {
-    originAgentCluster(headers);
-  }
-
   switch (options.referrerPolicy) {
     case undefined:
     case true:
@@ -87,7 +82,6 @@ export function generalSecurity(
 
 export type GeneralSecureOptions = {
   sameOrigin?: boolean;
-  originAgentCluster?: boolean;
   referrerPolicy?: ReferrerPolicyOptions | boolean;
   strictTransportSecurity?: StrictTransportSecurityOptions | boolean;
   xContentTypeOptions?: boolean;