Skip to content

Commit 4f204fa

Browse files
committed
Upgrade Scriban to 7.0.0 to fix security vulnerabilities
1 parent 9e8e83d commit 4f204fa

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<PackageVersion Include="Rebus" Version="8.8.0" />
151151
<PackageVersion Include="Rebus.ServiceProvider" Version="10.5.0" />
152152
<PackageVersion Include="Riok.Mapperly" Version="4.3.1" />
153-
<PackageVersion Include="Scriban" Version="6.6.0" />
153+
<PackageVersion Include="Scriban" Version="7.0.0" />
154154
<PackageVersion Include="Serilog" Version="4.3.0" />
155155
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
156156
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />

framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateLocalizer.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ public ScribanTemplateLocalizer(IStringLocalizer localizer)
1818
_localizer = localizer;
1919
}
2020

21-
public object Invoke(TemplateContext context, ScriptNode callerContext, ScriptArray arguments,
22-
ScriptBlockStatement blockStatement)
21+
public object? Invoke(TemplateContext context, ScriptNode? callerContext, ScriptArray arguments,
22+
ScriptBlockStatement? blockStatement)
2323
{
2424
return GetString(arguments);
2525
}
2626

27-
public ValueTask<object> InvokeAsync(TemplateContext context, ScriptNode callerContext, ScriptArray arguments,
28-
ScriptBlockStatement blockStatement)
27+
public ValueTask<object?> InvokeAsync(TemplateContext context, ScriptNode? callerContext, ScriptArray arguments,
28+
ScriptBlockStatement? blockStatement)
2929
{
30-
return new ValueTask<object>(GetString(arguments));
30+
return new ValueTask<object?>(GetString(arguments));
3131
}
3232

3333
private string GetString(ScriptArray arguments)
@@ -43,7 +43,7 @@ private string GetString(ScriptArray arguments)
4343
return string.Empty;
4444
}
4545

46-
var args = arguments.Skip(1).Where(x => x != null && !x.ToString().IsNullOrWhiteSpace()).ToArray();
46+
var args = arguments.Skip(1).Where(x => x != null && !x.ToString().IsNullOrWhiteSpace()).Cast<object>().ToArray();
4747
return args.Any() ? _localizer[name.ToString()!, args] : _localizer[name.ToString()!];
4848
}
4949

0 commit comments

Comments
 (0)