skills/paymog__slack-cli
1
0
Fork 0
mirror of https://github.com/paymog/slack-cli.git synced 2026-09-18 23:43:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(text): preserve message content; drop vestigial char allow-list

Browse Source
This commit is contained in:
Bayram Şahin
2026-04-18 00:18:10 +03:00
parent b24b1b08af
commit 6dd2feb887
2 changed files with 171 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/text/text_processor.go
+59 -72
View File
@@ -44,8 +44,6 @@ func AttachmentToText(att slack.Attachment) string {
result = strings.ReplaceAll(result, "\n", " ")
result = strings.ReplaceAll(result, "\r", " ")
result = strings.ReplaceAll(result, "\t", " ")
result = strings.ReplaceAll(result, "(", "[")
result = strings.ReplaceAll(result, ")", "]")
result = strings.TrimSpace(result)
return result
@@ -174,9 +172,11 @@ func TimestampToIsoRFC3339(slackTS string) (string, error) {
}
func ProcessText(s string) string {
s = filterSpecialChars(s)
s = normalizeLinks(s)
s = stripUnsafeRunes(s)
s = collapseInlineSpaces(s)
return s
return strings.TrimSpace(s)
}
func HumanizeCertificates(certs []*x509.Certificate) string {
@@ -192,28 +192,14 @@ func HumanizeCertificates(certs []*x509.Certificate) string {
return strings.Join(descriptions, ", ")
}
func filterSpecialChars(text string) string {
replaceWithCommaCheck := func(match []string, isLast bool) string {
var url, linkText string
var (
slackLinkRegex = regexp.MustCompile(`<(https?://[^>|]+)\|([^>]+)>`)
markdownLinkRegex = regexp.MustCompile(`\[([^\]]+)\]\((https?://[^)]+)\)`)
htmlLinkRegex = regexp.MustCompile(`<a\s+href=["']([^"']+)["'][^>]*>([^<]+)</a>`)
inlineSpaceRegex = regexp.MustCompile(`[ \t]+`)
)
if len(match) == 3 && strings.Contains(match[0], "|") {
url = match[1]
linkText = match[2]
} else if len(match) == 3 {
linkText = match[1]
url = match[2]
}
replacement := url + " - " + linkText
if !isLast {
replacement += ","
}
return replacement
}
// Helper function to check if this is the last link/element
func normalizeLinks(text string) string {
isLastInText := func(original string, currentText string) bool {
linkPos := strings.LastIndex(currentText, original)
if linkPos == -1 {
@@ -223,60 +209,61 @@ func filterSpecialChars(text string) string {
return afterLink == ""
}
// Handle Slack-style links: <URL|Description>
slackLinkRegex := regexp.MustCompile(`<(https?://[^>|]+)\|([^>]+)>`)
slackMatches := slackLinkRegex.FindAllStringSubmatch(text, -1)
for _, match := range slackMatches {
original := match[0]
isLast := isLastInText(original, text)
replacement := replaceWithCommaCheck(match, isLast)
text = strings.Replace(text, original, replacement, 1)
}
// Handle markdown links: [Description](URL)
markdownLinkRegex := regexp.MustCompile(`\[([^\]]+)\]\((https?://[^)]+)\)`)
markdownMatches := markdownLinkRegex.FindAllStringSubmatch(text, -1)
for _, match := range markdownMatches {
original := match[0]
isLast := isLastInText(original, text)
replacement := replaceWithCommaCheck(match, isLast)
text = strings.Replace(text, original, replacement, 1)
}
htmlLinkRegex := regexp.MustCompile(`<a\s+href=["']([^"']+)["'][^>]*>([^<]+)</a>`)
htmlMatches := htmlLinkRegex.FindAllStringSubmatch(text, -1)
for _, match := range htmlMatches {
original := match[0]
isLast := isLastInText(original, text)
url := match[1]
linkText := match[2]
replacement := url + " - " + linkText
render := func(url, linkText string, isLast bool) string {
out := url + " - " + linkText
if !isLast {
replacement += ","
out += ","
}
text = strings.Replace(text, original, replacement, 1)
return out
}
urlRegex := regexp.MustCompile(`https?://[^\s<>"{}|\\^` + "`" + `\[\]]+`)
urls := urlRegex.FindAllString(text, -1)
protected := text
for i, url := range urls {
placeholder := "___URL_PLACEHOLDER_" + string(rune(48+i)) + "___"
protected = strings.Replace(protected, url, placeholder, 1)
for _, match := range slackLinkRegex.FindAllStringSubmatch(text, -1) {
original := match[0]
text = strings.Replace(text, original, render(match[1], match[2], isLastInText(original, text)), 1)
}
cleanRegex := regexp.MustCompile(`[^0-9\p{L}\p{M}\s\.\,\-_:/\?=&%]`)
cleaned := cleanRegex.ReplaceAllString(protected, "")
// Restore the URLs
for i, url := range urls {
placeholder := "___URL_PLACEHOLDER_" + string(rune(48+i)) + "___"
cleaned = strings.Replace(cleaned, placeholder, url, 1)
for _, match := range markdownLinkRegex.FindAllStringSubmatch(text, -1) {
original := match[0]
text = strings.Replace(text, original, render(match[2], match[1], isLastInText(original, text)), 1)
}
spaceRegex := regexp.MustCompile(`[ \t]+`)
cleaned = spaceRegex.ReplaceAllString(cleaned, " ")
for _, match := range htmlLinkRegex.FindAllStringSubmatch(text, -1) {
original := match[0]
text = strings.Replace(text, original, render(match[1], match[2], isLastInText(original, text)), 1)
}
return strings.TrimSpace(cleaned)
return text
}
// stripUnsafeRunes removes runes that are display-corrupting or carry no
// semantic content: C0/C1 controls (except \t \n \r), DEL, BOM, zero-width
// joiners, and bidi overrides (a known prompt-injection vector in chat corpora).
func stripUnsafeRunes(s string) string {
var b strings.Builder
b.Grow(len(s))
for _, r := range s {
switch {
case r == '\t' || r == '\n' || r == '\r':
b.WriteRune(r)
case r < 0x20 || r == 0x7F:
continue
case r >= 0x80 && r <= 0x9F:
continue
case r == 0xFEFF:
continue
case r >= 0x200B && r <= 0x200F:
continue
case r >= 0x202A && r <= 0x202E:
continue
case r >= 0x2066 && r <= 0x2069:
continue
default:
b.WriteRune(r)
}
}
return b.String()
}
func collapseInlineSpaces(s string) string {
return inlineSpaceRegex.ReplaceAllString(s, " ")
}
pkg/text/text_processor_test.go
+112 -3
View File
@@ -108,7 +108,7 @@ func TestIsUnfurlingEnabled(t *testing.T) {
}
}
func TestFilterSpecialCharsWithCommas(t *testing.T) {
func TestProcessText_LinkNormalization(t *testing.T) {
tests := []struct {
name string
input string
@@ -149,13 +149,122 @@ func TestFilterSpecialCharsWithCommas(t *testing.T) {
input: "Check this [Google](https://google.com) out",
expected: "Check this https://google.com - Google, out",
},
{
name: "HTML anchor at end",
input: `Visit <a href="https://example.com">Example</a>`,
expected: "Visit https://example.com - Example",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := filterSpecialChars(tt.input)
result := ProcessText(tt.input)
if result != tt.expected {
t.Errorf("filterSpecialChars() = %q, expected %q", result, tt.expected)
t.Errorf("ProcessText() = %q, expected %q", result, tt.expected)
}
})
}
}
func TestProcessText_PreservesContent(t *testing.T) {
tests := []struct {
name string
input string
expected string
}{
{
name: "apostrophes in contractions",
input: "I'll let you know what didn't work, it's fine",
expected: "I'll let you know what didn't work, it's fine",
},
{
name: "straight double quotes",
input: `she said "hello" and left`,
expected: `she said "hello" and left`,
},
{
name: "curly quotes from iOS",
input: "\u2018don\u2019t\u2019 \u201csay\u201d that",
expected: "\u2018don\u2019t\u2019 \u201csay\u201d that",
},
{
name: "exclamation and question marks",
input: "wow! really?! amazing!!",
expected: "wow! really?! amazing!!",
},
{
name: "parentheses and brackets",
input: "see note (important) and [aside]",
expected: "see note (important) and [aside]",
},
{
name: "blockquote marker",
input: "> this was quoted",
expected: "> this was quoted",
},
{
name: "currency and math",
input: "costs $5.00 (2+2 = 4)",
expected: "costs $5.00 (2+2 = 4)",
},
{
name: "markdown emphasis",
input: "*bold* _italic_ ~strike~ `code`",
expected: "*bold* _italic_ ~strike~ `code`",
},
{
name: "unicode emoji",
input: "great work \U0001F389 \U0001F44D",
expected: "great work \U0001F389 \U0001F44D",
},
{
name: "raw slack mention markup",
input: "cc <@U0123ABC> in <#C0456DEF|general>",
expected: "cc <@U0123ABC> in <#C0456DEF|general>",
},
{
name: "raw broadcast mention",
input: "<!channel> please review",
expected: "<!channel> please review",
},
{
name: "preserves newlines, collapses inline spaces",
input: "first line\n\nsecond line with gaps",
expected: "first line\n\nsecond line with gaps",
},
{
name: "strips bidi override (prompt injection vector)",
input: "safe\u202etext",
expected: "safetext",
},
{
name: "strips zero-width joiner and BOM",
input: "a\u200bb\ufeffc",
expected: "abc",
},
{
name: "strips DEL and C0 controls; tabs collapse to space, newlines kept",
input: "ok\x01\x7fmessage\twith\ntabs",
expected: "okmessage with\ntabs",
},
{
name: "twelve URLs in one message (regression for placeholder bug)",
input: "see https://a.example/1 and https://b.example/2 and https://c.example/3 " +
"and https://d.example/4 and https://e.example/5 and https://f.example/6 " +
"and https://g.example/7 and https://h.example/8 and https://i.example/9 " +
"and https://j.example/10 and https://k.example/11 and https://l.example/12",
expected: "see https://a.example/1 and https://b.example/2 and https://c.example/3 " +
"and https://d.example/4 and https://e.example/5 and https://f.example/6 " +
"and https://g.example/7 and https://h.example/8 and https://i.example/9 " +
"and https://j.example/10 and https://k.example/11 and https://l.example/12",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := ProcessText(tt.input)
if result != tt.expected {
t.Errorf("ProcessText(%q)\n got: %q\n want: %q", tt.input, result, tt.expected)
}
})
}