Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-25719

bad html content after upgrading to Email Extension Plugin v2.39

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Major Major
    • email-ext-plugin
    • None

      after upgrading from 2.38.2 to 2.39, html content in html email is not correct.

      v2.38.2:

      </head><body><h1>Compte rendu d'installation sur WMS11DEV</h1>
      
      <p>
      Veuillez trouver la liste des patchs installés sur l'environnement WMS11DEV :
      </p>
      

      v 2.39:

      </head><body><h1>Compte rendu d&amp;apos;installation sur WMS11DEV</h1>
      
      <p>
      Veuillez trouver la liste des patchs installés sur l&amp;apos;environnement WMS11DEV :
      </p>
      

      the correct content is with

      Compte rendu d'installation sur WMS11DEV
      

        1. v2.38.2.jpg
          v2.38.2.jpg
          20 kB
        2. v2.39.jpg
          v2.39.jpg
          23 kB

          [JENKINS-25719] bad html content after upgrading to Email Extension Plugin v2.39

          Alex Earl added a comment - - edited

          My guess is that it is this line:

          doc.outputSettings(doc.outputSettings().prettyPrint(false).escapeMode(Entities.EscapeMode.xhtml));

          The escapeMode was not there before. I have a different fix for this in that if no data-inline is present, then it won't process via Jsoup at all.

          Alex Earl added a comment - - edited My guess is that it is this line: doc.outputSettings(doc.outputSettings().prettyPrint(false).escapeMode(Entities.EscapeMode.xhtml)); The escapeMode was not there before. I have a different fix for this in that if no data-inline is present, then it won't process via Jsoup at all.

          Alex Earl added a comment -

          Will be fixed in 2.40 which should come out in a few weeks.

          Alex Earl added a comment - Will be fixed in 2.40 which should come out in a few weeks.

          Code changed in jenkins
          User: Alex Earl
          Path:
          pom.xml
          src/main/java/hudson/plugins/emailext/AttachmentUtils.java
          src/main/java/hudson/plugins/emailext/EmailExtTemplateAction.java
          src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
          src/main/java/hudson/plugins/emailext/ExtendedEmailPublisherDescriptor.java
          src/main/java/hudson/plugins/emailext/plugins/CssInliner.java
          src/main/java/hudson/plugins/emailext/plugins/EmailTrigger.java
          src/main/java/hudson/plugins/emailext/plugins/EmailTriggerDescriptor.java
          src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
          src/main/java/hudson/plugins/emailext/plugins/trigger/PreBuildScriptTrigger.java
          src/main/java/hudson/plugins/emailext/plugins/trigger/ScriptTrigger.java
          src/main/java/hudson/plugins/emailext/watching/EmailExtWatchAction.java
          src/main/java/hudson/plugins/emailext/watching/EmailExtWatchJobProperty.java
          src/main/resources/hudson/plugins/emailext/EmailExtTemplateAction/action.groovy
          src/main/resources/hudson/plugins/emailext/EmailExtTemplateAction/action.jelly
          src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/global.groovy
          src/main/resources/hudson/plugins/emailext/Messages.properties
          src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/help-triggers.html
          src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/help-triggers_ja.html
          src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/help-triggers_zh_TW.html
          src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/index.groovy
          src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/index.properties
          src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/jobMain.groovy
          src/main/webapp/help/globalConfig/watching.html
          src/test/java/hudson/plugins/emailext/EmailTypeTest.java
          src/test/java/hudson/plugins/emailext/plugins/CssInlinerTest.java
          src/test/java/hudson/plugins/emailext/plugins/content/JellyScriptContentTest.java
          src/test/java/hudson/plugins/emailext/plugins/content/ScriptContentChangeLogSet.java
          src/test/java/hudson/plugins/emailext/plugins/content/ScriptContentTest.java
          src/test/java/hudson/plugins/emailext/plugins/recipients/MockUtilities.java
          src/test/resources/recipient-provider-upgrade2.xml
          http://jenkins-ci.org/commit/email-ext-plugin/bb0053d79fec59f34d3014117883282d6c2239dc
          Log:
          Fix JENKINS-18567, JENKINS-25926 and JENKINS-25719

          Added ability for users to watch a job.
          Fixup the html content coming from CssInliner
          Remove adminAddress field for global config

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Alex Earl Path: pom.xml src/main/java/hudson/plugins/emailext/AttachmentUtils.java src/main/java/hudson/plugins/emailext/EmailExtTemplateAction.java src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java src/main/java/hudson/plugins/emailext/ExtendedEmailPublisherDescriptor.java src/main/java/hudson/plugins/emailext/plugins/CssInliner.java src/main/java/hudson/plugins/emailext/plugins/EmailTrigger.java src/main/java/hudson/plugins/emailext/plugins/EmailTriggerDescriptor.java src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java src/main/java/hudson/plugins/emailext/plugins/trigger/PreBuildScriptTrigger.java src/main/java/hudson/plugins/emailext/plugins/trigger/ScriptTrigger.java src/main/java/hudson/plugins/emailext/watching/EmailExtWatchAction.java src/main/java/hudson/plugins/emailext/watching/EmailExtWatchJobProperty.java src/main/resources/hudson/plugins/emailext/EmailExtTemplateAction/action.groovy src/main/resources/hudson/plugins/emailext/EmailExtTemplateAction/action.jelly src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/global.groovy src/main/resources/hudson/plugins/emailext/Messages.properties src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/help-triggers.html src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/help-triggers_ja.html src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/help-triggers_zh_TW.html src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/index.groovy src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/index.properties src/main/resources/hudson/plugins/emailext/watching/EmailExtWatchAction/jobMain.groovy src/main/webapp/help/globalConfig/watching.html src/test/java/hudson/plugins/emailext/EmailTypeTest.java src/test/java/hudson/plugins/emailext/plugins/CssInlinerTest.java src/test/java/hudson/plugins/emailext/plugins/content/JellyScriptContentTest.java src/test/java/hudson/plugins/emailext/plugins/content/ScriptContentChangeLogSet.java src/test/java/hudson/plugins/emailext/plugins/content/ScriptContentTest.java src/test/java/hudson/plugins/emailext/plugins/recipients/MockUtilities.java src/test/resources/recipient-provider-upgrade2.xml http://jenkins-ci.org/commit/email-ext-plugin/bb0053d79fec59f34d3014117883282d6c2239dc Log: Fix JENKINS-18567 , JENKINS-25926 and JENKINS-25719 Added ability for users to watch a job. Fixup the html content coming from CssInliner Remove adminAddress field for global config

            slide_o_mix Alex Earl
            raphael_unique Raphaël UNIQUE
            Votes:
            1 Vote for this issue
            Watchers:
            5 Start watching this issue

              Created:
              Updated:
              Resolved: