mirror of
https://github.com/usememos/memos.git
synced 2025-04-24 06:17:28 +02:00
chore: return raw text for html (#782)
This commit is contained in:
parent
6c17f94ef6
commit
b704c20809
@ -43,10 +43,6 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filename := file.Filename
|
filename := file.Filename
|
||||||
if strings.HasSuffix(filename, ".html") {
|
|
||||||
return echo.NewHTTPError(http.StatusBadRequest, "html file is not allowed")
|
|
||||||
}
|
|
||||||
|
|
||||||
filetype := file.Header.Get("Content-Type")
|
filetype := file.Header.Get("Content-Type")
|
||||||
size := file.Size
|
size := file.Size
|
||||||
src, err := file.Open()
|
src, err := file.Open()
|
||||||
@ -169,42 +165,6 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
|
|||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
g.DELETE("/resource/:resourceId", func(c echo.Context) error {
|
|
||||||
ctx := c.Request().Context()
|
|
||||||
userID, ok := c.Get(getUserIDContextKey()).(int)
|
|
||||||
if !ok {
|
|
||||||
return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
|
|
||||||
}
|
|
||||||
|
|
||||||
resourceID, err := strconv.Atoi(c.Param("resourceId"))
|
|
||||||
if err != nil {
|
|
||||||
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
resource, err := s.Store.FindResource(ctx, &api.ResourceFind{
|
|
||||||
ID: &resourceID,
|
|
||||||
CreatorID: &userID,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find resource").SetInternal(err)
|
|
||||||
}
|
|
||||||
if resource == nil {
|
|
||||||
return echo.NewHTTPError(http.StatusNotFound, "Not find resource").SetInternal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
resourceDelete := &api.ResourceDelete{
|
|
||||||
ID: resourceID,
|
|
||||||
}
|
|
||||||
if err := s.Store.DeleteResource(ctx, resourceDelete); err != nil {
|
|
||||||
if common.ErrorCode(err) == common.NotFound {
|
|
||||||
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Resource ID not found: %d", resourceID))
|
|
||||||
}
|
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to delete resource").SetInternal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return c.JSON(http.StatusOK, true)
|
|
||||||
})
|
|
||||||
|
|
||||||
g.PATCH("/resource/:resourceId", func(c echo.Context) error {
|
g.PATCH("/resource/:resourceId", func(c echo.Context) error {
|
||||||
ctx := c.Request().Context()
|
ctx := c.Request().Context()
|
||||||
userID, ok := c.Get(getUserIDContextKey()).(int)
|
userID, ok := c.Get(getUserIDContextKey()).(int)
|
||||||
@ -245,6 +205,42 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
|
g.DELETE("/resource/:resourceId", func(c echo.Context) error {
|
||||||
|
ctx := c.Request().Context()
|
||||||
|
userID, ok := c.Get(getUserIDContextKey()).(int)
|
||||||
|
if !ok {
|
||||||
|
return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
|
||||||
|
}
|
||||||
|
|
||||||
|
resourceID, err := strconv.Atoi(c.Param("resourceId"))
|
||||||
|
if err != nil {
|
||||||
|
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.Param("resourceId"))).SetInternal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
resource, err := s.Store.FindResource(ctx, &api.ResourceFind{
|
||||||
|
ID: &resourceID,
|
||||||
|
CreatorID: &userID,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find resource").SetInternal(err)
|
||||||
|
}
|
||||||
|
if resource == nil {
|
||||||
|
return echo.NewHTTPError(http.StatusNotFound, "Not find resource").SetInternal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
resourceDelete := &api.ResourceDelete{
|
||||||
|
ID: resourceID,
|
||||||
|
}
|
||||||
|
if err := s.Store.DeleteResource(ctx, resourceDelete); err != nil {
|
||||||
|
if common.ErrorCode(err) == common.NotFound {
|
||||||
|
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Resource ID not found: %d", resourceID))
|
||||||
|
}
|
||||||
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to delete resource").SetInternal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.JSON(http.StatusOK, true)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) registerResourcePublicRoutes(g *echo.Group) {
|
func (s *Server) registerResourcePublicRoutes(g *echo.Group) {
|
||||||
@ -267,8 +263,12 @@ func (s *Server) registerResourcePublicRoutes(g *echo.Group) {
|
|||||||
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to fetch resource ID: %v", resourceID)).SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to fetch resource ID: %v", resourceID)).SetInternal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Response().Writer.WriteHeader(http.StatusOK)
|
if strings.HasPrefix(resource.Type, echo.MIMETextHTML) {
|
||||||
|
c.Response().Writer.Header().Set("Content-Type", echo.MIMETextPlain)
|
||||||
|
} else {
|
||||||
c.Response().Writer.Header().Set("Content-Type", resource.Type)
|
c.Response().Writer.Header().Set("Content-Type", resource.Type)
|
||||||
|
}
|
||||||
|
c.Response().Writer.WriteHeader(http.StatusOK)
|
||||||
c.Response().Writer.Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable")
|
c.Response().Writer.Header().Set(echo.HeaderCacheControl, "max-age=31536000, immutable")
|
||||||
if _, err := c.Response().Writer.Write(resource.Blob); err != nil {
|
if _, err := c.Response().Writer.Write(resource.Blob); err != nil {
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write response").SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to write response").SetInternal(err)
|
||||||
|
@ -43,11 +43,10 @@ func (db *DB) Open(ctx context.Context) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Connect to the database without foreign_key.
|
// Connect to the database without foreign_key.
|
||||||
sqliteDB, err := sql.Open("sqlite3", db.profile.DSN+"?_foreign_keys=0")
|
sqliteDB, err := sql.Open("sqlite3", db.profile.DSN+"?cache=shared&_foreign_keys=0&_busy_timeout=9999999")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to open db with dsn: %s, err: %w", db.profile.DSN, err)
|
return fmt.Errorf("failed to open db with dsn: %s, err: %w", db.profile.DSN, err)
|
||||||
}
|
}
|
||||||
sqliteDB.SetMaxOpenConns(1)
|
|
||||||
db.Db = sqliteDB
|
db.Db = sqliteDB
|
||||||
|
|
||||||
if db.profile.Mode == "dev" {
|
if db.profile.Mode == "dev" {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user