projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'admin-configure-atom-keys' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
xml
/
xml.ex
diff --git
a/lib/pleroma/web/xml/xml.ex
b/lib/pleroma/web/xml/xml.ex
index 8b609f6958b0bb8c6be7daabfeac99904d2eb71c..df50aac9c027aebb737c7b09a9b427a9321012fc 100644
(file)
--- a/
lib/pleroma/web/xml/xml.ex
+++ b/
lib/pleroma/web/xml/xml.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.XML do
require Logger
defmodule Pleroma.Web.XML do
require Logger
@@
-14,7
+18,7
@@
defmodule Pleroma.Web.XML do
if res == "", do: nil, else: res
catch
if res == "", do: nil, else: res
catch
- e ->
+
_
e ->
Logger.debug("Couldn't find xpath #{xpath} in XML doc")
nil
end
Logger.debug("Couldn't find xpath #{xpath} in XML doc")
nil
end
@@
-25,9
+29,13
@@
defmodule Pleroma.Web.XML do
{doc, _rest} =
text
|> :binary.bin_to_list()
{doc, _rest} =
text
|> :binary.bin_to_list()
- |> :xmerl_scan.string()
+ |> :xmerl_scan.string(
quiet: true
)
doc
doc
+ rescue
+ _e ->
+ Logger.debug("Couldn't parse XML: #{inspect(text)}")
+ :error
catch
:exit, _error ->
Logger.debug("Couldn't parse XML: #{inspect(text)}")
catch
:exit, _error ->
Logger.debug("Couldn't parse XML: #{inspect(text)}")