Skip to content

Preserve embedded style and script #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattesmohr merged 9 commits into from
Nov 5, 2025
Merged

Preserve embedded style and script #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d14544
Preserve embedded code
mattesmohr Oct 18, 2025
1ee7d1d
Make the encoder more diverse
mattesmohr Oct 25, 2025
5ca3b97
Introduce a sanitizer
mattesmohr Oct 25, 2025
22144f5
Revise the escaping
mattesmohr Oct 25, 2025
5aea80c
Refactor the code a bit
mattesmohr Oct 28, 2025
36b7bca
Apply the correct encoding
mattesmohr Nov 2, 2025
44b671a
Fix the tests
mattesmohr Nov 3, 2025
8fc6d7c
Mark related attributes as tainted
mattesmohr Nov 3, 2025
57d0946
Escape only relevant attribute values
mattesmohr Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Sources/HTMLKit/Abstraction/Attributes/BasicAttributes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3484,13 +3484,21 @@ extension StyleAttribute where Self: ContentNode {
internal func mutate(style value: String) -> Self {
return self.mutate(key: "style", value: value)
}

internal func mutate(style value: TaintedString) -> Self {
return self.mutate(key: "style", value: value)
}
}

extension StyleAttribute where Self: EmptyNode {

internal func mutate(style value: String) -> Self {
return self.mutate(key: "style", value: value)
}

internal func mutate(style value: TaintedString) -> Self {
return self.mutate(key: "style", value: value)
}
}

/// A type that provides the `tabIndex` modifier.
Expand Down
12 changes: 6 additions & 6 deletions Sources/HTMLKit/Abstraction/Elements/BasicElements.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ extension Html: GlobalAttributes, GlobalEventAttributes {
}

public func style(_ value: String) -> Html {
return mutate(style: value)
return mutate(style: TaintedString(value, as: .css(.attribute)))
}

public func tabIndex(_ value: Int) -> Html {
Expand Down Expand Up @@ -257,23 +257,23 @@ extension Html: GlobalAttributes, GlobalEventAttributes {
}

public func on(event: Events.Drag, _ value: String) -> Html {
return mutate(key: event.rawValue, value: value)
return mutate(key: event.rawValue, value: TaintedString(value, as: .js(.attribute)))
}

public func on(event: Events.Clipboard, _ value: String) -> Html {
return mutate(key: event.rawValue, value: value)
return mutate(key: event.rawValue, value: TaintedString(value, as: .js(.attribute)))
}

public func on(event: Events.Keyboard, _ value: String) -> Html {
return mutate(key: event.rawValue, value: value)
return mutate(key: event.rawValue, value: TaintedString(value, as: .js(.attribute)))
}

public func on(event: Events.Mouse, _ value: String) -> Html {
return mutate(key: event.rawValue, value: value)
return mutate(key: event.rawValue, value: TaintedString(value, as: .js(.attribute)))
}

public func on(event: Events.Wheel, _ value: String) -> Html {
return mutate(key: event.rawValue, value: value)
return mutate(key: event.rawValue, value: TaintedString(value, as: .js(.attribute)))
}
}

Expand Down
Loading